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

Finish transformation to three digit numbers in server IDs.

This commit is contained in:
Max Neunhoeffer 2016-06-13 14:37:15 +02:00
parent 2a7f4684f4
commit 0040105e80
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/actions/api-cluster.js
View File

@ -1291,10 +1291,10 @@ actions.defineHttp({
/// The attribute name is the collection name. Each value is an object /// The attribute name is the collection name. Each value is an object
/// of the following form: /// of the following form:
/// ///
/// { "collection1": { "Plan": { "s100001": ["DBServer1", "DBServer2"], /// { "collection1": { "Plan": { "s100001": ["DBServer001", "DBServer002"],
/// "s100002": ["DBServer3", "DBServer4"] }, /// "s100002": ["DBServer003", "DBServer004"] },
/// "Current": { "s100001": ["DBServer1", "DBServer2"], /// "Current": { "s100001": ["DBServer001", "DBServer002"],
/// "s100002": ["DBServer3"] } }, /// "s100002": ["DBServer003"] } },
/// "collection2": ... /// "collection2": ...
/// } /// }
/// ///

2
js/apps/system/_admin/aardvark/APP/frontend/js/views/nodeView.js
View File

@ -111,7 +111,7 @@
self.dbServer = self.dbServers[0]; self.dbServer = self.dbServers[0];
self.dbServer.each(function(model) { self.dbServer.each(function(model) {
if (model.get("name") === 'DBServer1') { if (model.get("name") === 'DBServer001') {
self.dbServer = model; self.dbServer = model;
} }
}); });

4
js/client/tests/agency/agency-test.js
View File

@ -362,7 +362,7 @@ function agencyTestSuite () {
} }
var requests = [ var requests = [
["/_api/agency/write", [[{"/arango/Plan/DBServers/DBServer1":{"new":"none","op":"set"}}]]], ["/_api/agency/write", [[{"/arango/Plan/DBServers/DBServer001":{"new":"none","op":"set"}}]]],
["/_api/agency/read", [["/arango/Plan/DBServers"]]], ["/_api/agency/read", [["/arango/Plan/DBServers"]]],
]; ];
@ -371,7 +371,7 @@ function agencyTestSuite () {
assertEqual(res.statusCode, 200); assertEqual(res.statusCode, 200);
}); });
assertEqual(res.body, JSON.stringify([{"arango":{"Plan":{"DBServers":{"DBServer1":"none"}}}}])); assertEqual(res.body, JSON.stringify([{"arango":{"Plan":{"DBServers":{"DBServer001":"none"}}}}]));
} }
}; };
} }

15
js/server/tests/resilience/moving-shards-cluster.js
View File

@ -140,7 +140,7 @@ function MovingShardsSuite () {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
function cleanOutServer(id) { function cleanOutServer(id) {
var coordEndpoint = global.ArangoClusterInfo.getServerEndpoint("Coordinator1"); var coordEndpoint = global.ArangoClusterInfo.getServerEndpoint("Coordinator001");
var request = require("@arangodb/request"); var request = require("@arangodb/request");
var endpointToURL = require("@arangodb/cluster").endpointToURL; var endpointToURL = require("@arangodb/cluster").endpointToURL;
var url = endpointToURL(coordEndpoint); var url = endpointToURL(coordEndpoint);
@ -155,7 +155,7 @@ function MovingShardsSuite () {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
function moveShard(database, collection, shard, fromServer, toServer) { function moveShard(database, collection, shard, fromServer, toServer) {
var coordEndpoint = global.ArangoClusterInfo.getServerEndpoint("Coordinator1"); var coordEndpoint = global.ArangoClusterInfo.getServerEndpoint("Coordinator001");
var request = require("@arangodb/request"); var request = require("@arangodb/request");
var endpointToURL = require("@arangodb/cluster").endpointToURL; var endpointToURL = require("@arangodb/cluster").endpointToURL;
var url = endpointToURL(coordEndpoint); var url = endpointToURL(coordEndpoint);
@ -197,10 +197,17 @@ function MovingShardsSuite () {
function findServerNotOnList(list) { function findServerNotOnList(list) {
var count = 1; var count = 1;
var name = "DBServer" + count; var str = "" + count;
var pad = "000";
var ans = pad.substring(0, pad.length - str.length) + str;
var name = "DBServer" + ans;
while (list.indexOf(name) >= 0) { while (list.indexOf(name) >= 0) {
require("internal").print(list, name);
count += 1; count += 1;
name = "DBServer" + count; str = "" + count;
ans = pad.substring(0, pad.length - str.length) + str;
name = "DBServer" + ans;
} }
return name; return name;
} }