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

Yet another fix for process shutdown on Unix.

This commit is contained in:
Max Neunhoeffer 2014-03-07 16:20:12 +01:00
parent aca081ebaa
commit 6206f91d56
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/server/modules/org/arangodb/cluster/kickstarter.js
View File

@ -356,13 +356,10 @@ launchActions.createSystemColls = function (dispatchers, cmd, isRelaunch) {
shutdownActions.startAgent = function (dispatchers, cmd, run) { shutdownActions.startAgent = function (dispatchers, cmd, run) {
console.info("Shutting down agent %s", JSON.stringify(run.pid)); console.info("Shutting down agent %s", JSON.stringify(run.pid));
killExternal(run.pid); killExternal(run.pid);
statusExternal(run.pid);
return {"error": false, "isStartAgent": true}; return {"error": false, "isStartAgent": true};
}; };
shutdownActions.sendConfiguration = function (dispatchers, cmd, run) { shutdownActions.sendConfiguration = function (dispatchers, cmd, run) {
console.info("Waiting for 3 seconds for servers before shutting down agency.");
wait(3);
return {"error": false, "isSendConfiguration": true}; return {"error": false, "isSendConfiguration": true};
}; };
@ -379,12 +376,15 @@ shutdownActions.startServers = function (dispatchers, cmd, run) {
} }
download(url,"",{method:"GET", headers: hdrs}); download(url,"",{method:"GET", headers: hdrs});
} }
console.info("Waiting 3 seconds for servers to shutdown gracefully..."); console.info("Waiting 5 seconds for servers to shutdown gracefully...");
wait(3); wait(5);
for (i = 0;i < run.pids.length;i++) { for (i = 0;i < run.pids.length;i++) {
console.info("Shutting down %s the hard way...", JSON.stringify(run.pids[i])); var s = statusExternal(run.pids[i]);
if (s.status !== "TERMINATED") {
console.info("Shutting down %s the hard way...",
JSON.stringify(run.pids[i]));
killExternal(run.pids[i]); killExternal(run.pids[i]);
statusExternal(run.pids[i]); }
} }
return {"error": false, "isStartServers": true}; return {"error": false, "isStartServers": true};
}; };

14
lib/BasicsC/process-utils.c
View File

@ -970,7 +970,12 @@ TRI_external_status_t TRI_CheckExternalProcess (TRI_external_id_t pid,
#ifndef _WIN32 #ifndef _WIN32
static bool ourKillProcess(TRI_external_t* pid) { static bool ourKillProcess(TRI_external_t* pid) {
return (0 != kill(pid->_pid, SIGTERM)); bool success;
int loc;
success = (0 != kill(pid->_pid, SIGTERM));
// And wait for it to avoid a zombie:
waitpid(pid->_pid, &loc, WUNTRACED);
return success;
} }
#else #else
static bool ourKillProcess(TRI_external_t* pid) { static bool ourKillProcess(TRI_external_t* pid) {
@ -1019,6 +1024,8 @@ bool TRI_KillExternalProcess (TRI_external_id_t pid) {
TRI_external_t* external; TRI_external_t* external;
size_t i; size_t i;
bool ok = true; bool ok = true;
bool success;
int loc;
TRI_LockMutex(&ExternalProcessesLock); TRI_LockMutex(&ExternalProcessesLock);
@ -1034,7 +1041,10 @@ bool TRI_KillExternalProcess (TRI_external_id_t pid) {
TRI_UnlockMutex(&ExternalProcessesLock); TRI_UnlockMutex(&ExternalProcessesLock);
#ifndef _WIN32 #ifndef _WIN32
// Kill just in case: // Kill just in case:
return (0 != kill(pid._pid, SIGTERM)); success = (0 != kill(pid._pid, SIGTERM));
// And wait for it to avoid a zombie:
waitpid(pid._pid, &loc, WUNTRACED);
return success;
#else #else
return ourKillProcessPID(pid._pid); return ourKillProcessPID(pid._pid);
#endif #endif