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

Fixed lost precondition when removing server. (#8986)

This commit is contained in:
Lars Maier 2019-05-14 15:37:03 +02:00 committed by Max Neunhöffer
parent e5e597b847
commit 6733f2a54d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,11 +80,9 @@ actions.defineHttp({
let msg = ""; let msg = "";
let used = []; let used = [];
while (++count <= 60) { while (++count <= 60) {
let preconditions = {};
preconditions['/arango/Supervision/Health/' + serverId + '/Status'] = {'old': 'FAILED'};
// need to make sure it is not responsible for anything // need to make sure it is not responsible for anything
used = []; used = [];
preconditions = reducePlanServers(function (data, agencyKey, servers) { let preconditions = reducePlanServers(function (data, agencyKey, servers) {
data[agencyKey] = {'old': servers}; data[agencyKey] = {'old': servers};
if (servers.indexOf(serverId) !== -1) { if (servers.indexOf(serverId) !== -1) {
used.push(agencyKey); used.push(agencyKey);
@ -99,6 +97,7 @@ actions.defineHttp({
return data; return data;
}, preconditions); }, preconditions);
preconditions['/arango/Supervision/Health/' + serverId + '/Status'] = {'old': 'FAILED'};
preconditions["/arango/Supervision/DBServers/" + serverId] preconditions["/arango/Supervision/DBServers/" + serverId]
= { "oldEmpty": true }; = { "oldEmpty": true };
@ -107,6 +106,7 @@ actions.defineHttp({
operations['/arango/Plan/Coordinators/' + serverId] = {'op': 'delete'}; operations['/arango/Plan/Coordinators/' + serverId] = {'op': 'delete'};
operations['/arango/Plan/DBServers/' + serverId] = {'op': 'delete'}; operations['/arango/Plan/DBServers/' + serverId] = {'op': 'delete'};
operations['/arango/Current/ServersRegistered/' + serverId] = {'op': 'delete'}; operations['/arango/Current/ServersRegistered/' + serverId] = {'op': 'delete'};
operations['/arango/Current/DBServers/' + serverId] = {'op': 'delete'};
operations['/arango/Supervision/Health/' + serverId] = {'op': 'delete'}; operations['/arango/Supervision/Health/' + serverId] = {'op': 'delete'};
operations['/arango/Target/MapUniqueToShortID/' + serverId] = {'op': 'delete'}; operations['/arango/Target/MapUniqueToShortID/' + serverId] = {'op': 'delete'};