Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix tests on cluster.

This commit is contained in:
Max Neunhoeffer 2014-02-25 11:35:12 +01:00
parent 974cc8b441
commit 799eb7c854
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/server/tests/shell-sharding-helpers.js
View File

@ -27,6 +27,7 @@
var cluster = require("org/arangodb/cluster"); var cluster = require("org/arangodb/cluster");
var jsunity = require("jsunity"); var jsunity = require("jsunity");
var _ = require("underscore");
var compareStringIds = function (l, r) { var compareStringIds = function (l, r) {
if (l.length != r.length) { if (l.length != r.length) {
@ -269,7 +270,7 @@ function ClusterEnabledSuite () {
shardKeys: [ "_key" ], shardKeys: [ "_key" ],
shards: { "s1" : "myself", "s2" : "other" } shards: { "s1" : "myself", "s2" : "other" }
}; };
assertTrue(agency.set("Current/Collections/test/" + collection.id, collection)); assertTrue(agency.set("Plan/Collections/test/" + collection.id, collection));
var data = ci.getCollectionInfo("test", collection.id); var data = ci.getCollectionInfo("test", collection.id);
@ -295,7 +296,9 @@ function ClusterEnabledSuite () {
shards: { "s1" : "myself", "s2" : "other", "s3" : "foo", "s4" : "bar" } shards: { "s1" : "myself", "s2" : "other", "s3" : "foo", "s4" : "bar" }
}; };
assertTrue(agency.set("Current/Collections/test/" + collection.id, collection)); assertTrue(agency.set("Plan/Collections/test/" + collection.id, collection));
ci.flush();
var data = ci.getCollectionInfo("test", collection.id); var data = ci.getCollectionInfo("test", collection.id);
@ -318,17 +321,26 @@ function ClusterEnabledSuite () {
type: 3, type: 3,
status: 2, // LOADED status: 2, // LOADED
shardKeys: [ "_key", "a", "bc" ], shardKeys: [ "_key", "a", "bc" ],
shards: { "s1" : "myself" } shards: { "s1" : "myself" },
error: false,
errorNum: 0,
DBServer: "myself"
}; };
assertTrue(agency.set("Current/Collections/test/" + collection.id, collection)); assertTrue(agency.set("Current/Collections/test/" + collection.id +
"/s1", collection));
ci.flush(); ci.flush();
assertEqual("myself", ci.getResponsibleServer("s1")); assertEqual("myself", ci.getResponsibleServer("s1"));
assertEqual("", ci.getResponsibleServer("s9999")); assertEqual("", ci.getResponsibleServer("s9999"));
collection.shards = { s1: "other", s2: "myself" }; collection.shards = { s1: "other", s2: "myself" };
assertTrue(agency.set("Current/Collections/test/" + collection.id, collection)); collection.DBServer = "myself";
assertTrue(agency.set("Current/Collections/test/" + collection.id +
"/s2", collection));
collection.DBServer = "other";
assertTrue(agency.set("Current/Collections/test/" + collection.id +
"/s1", collection));
ci.flush(); ci.flush();
assertEqual("other", ci.getResponsibleServer("s1")); assertEqual("other", ci.getResponsibleServer("s1"));
@ -340,18 +352,18 @@ function ClusterEnabledSuite () {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
testGetServerEndpoint : function () { testGetServerEndpoint : function () {
assertTrue(agency.set("Current/ServersRegistered/myself", "tcp://127.0.0.1:8529")); assertTrue(agency.set("Current/ServersRegistered/myself", {endpoint:"tcp://127.0.0.1:8529"}));
ci.flush(); ci.flush();
assertEqual("tcp://127.0.0.1:8529", ci.getServerEndpoint("myself")); assertEqual("tcp://127.0.0.1:8529", ci.getServerEndpoint("myself"));
assertTrue(agency.set("Current/ServersRegistered/myself", "tcp://127.0.0.1:8530")); assertTrue(agency.set("Current/ServersRegistered/myself", {endpoint:"tcp://127.0.0.1:8530"}));
ci.flush(); ci.flush();
assertEqual("tcp://127.0.0.1:8530", ci.getServerEndpoint("myself")); assertEqual("tcp://127.0.0.1:8530", ci.getServerEndpoint("myself"));
assertTrue(agency.remove("Current/ServersRegistered/myself")); assertTrue(agency.remove("Current/ServersRegistered/myself"));
assertTrue(agency.set("Current/ServersRegistered/other", "tcp://127.0.0.1:8529")); assertTrue(agency.set("Current/ServersRegistered/other", {endpoint:"tcp://127.0.0.1:8529"}));
ci.flush(); ci.flush();
assertEqual("", ci.getServerEndpoint("myself")); assertEqual("", ci.getServerEndpoint("myself"));