1
0
Fork 0

Fix shutting down of cluster; give a little more time.

This commit is contained in:
Willi Goesgens 2015-05-12 17:22:32 +02:00
parent 495709f3a0
commit 37cdc7a379
1 changed files with 3 additions and 4 deletions

View File

@ -551,19 +551,18 @@ shutdownActions.startServers = function (dispatchers, cmd, run) {
// we cannot do much with the result...
}
var shutdownWait = 8;
var shutdownWait = 20;
if (cmd.valgrind !== '') {
shutdownWait *= 10000;
}
console.info("Waiting " + shutdownWait + " seconds for servers to shutdown gracefully...");
console.info("Waiting up to " + shutdownWait + " seconds for servers to shutdown gracefully...");
var j = 0;
var runpids = run.pids.length;
while ((j < shutdownWait) && (runpids > 0)) {
wait(1);
j++;
for (i = 0; i < run.pids.length; i++) {
if (serverStates[JSON.stringify(run.pids[i].pid)] === undefined) {
if (serverStates[JSON.stringify(run.pids[i])] === undefined) {
var s = statusExternal(run.pids[i]);
if ((s.status === "NOT-FOUND") ||