10000 Revert "Revert "rework process handling (#3322)"" · arangodb/arangodb@3a4cf41 · GitHub
[go: up one dir, main page]

Skip to content

Commit 3a4cf41

Browse files
committed
Revert "Revert "rework process handling (#3322)""
This reverts commit d2b62c9.
1 parent d2b62c9 commit 3a4cf41

File tree

6 files changed

+622
-437
lines changed

6 files changed

+622
-437
lines changed

js/client/modules/@arangodb/process-utils.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -765,13 +765,10 @@ function shutdownArangod (arangod, options, forceTerminate) {
765765
if ((arangod.exitStatus === undefined) ||
766766
(arangod.exitStatus.status === 'RUNNING')) {
767767
if (forceTerminate) {
768-
killExternal(arangod.pid, abortSignal);
769-
arangod.exitStatus = {
770-
SIGNAL: String(abortSignal)
771-
};
768+
arangod.exitStatus = killExternal(arangod.pid, abortSignal);
772769
analyzeServerCrash(arangod, options, 'shutdown timeout; instance forcefully KILLED because of fatal timeout in testrun');
773770
} else if (options.useKillExternal) {
774-
killExternal(arangod.pid);
771+
arangod.exitStatus = killExternal(arangod.pid);
775772
} else {
776773
const requestOptions = makeAuthorizationHeaders(options);
777774
requestOptions.method = 'DELETE';
@@ -864,7 +861,7 @@ function shutdownInstance (instanceInfo, options, forceTerminate) {
864861
];
865862
}
866863
*/
867-
killExternal(arangod.pid, abortSignal);
864+
arangod.exitStatus = killExternal(arangod.pid, abortSignal);
868865
analyzeServerCrash(arangod, options, 'shutdown timeout; instance forcefully KILLED after 60s - ' + arangod.exitStatus.signal);
869866
return false;
870867
} else {
@@ -987,7 +984,7 @@ function startInstanceCluster (instanceInfo, protocol, options,
987984

988985
if (!checkArangoAlive(arangod, options)) {
989986
instanceInfo.arangods.forEach(arangod => {
990-
killExternal(arangod.pid, abortSignal);
987+
arangod.exitStatus = killExternal(arangod.pid, abortSignal);
991988
analyzeServerCrash(arangod, options, 'startup timeout; forcefully terminating ' + arangod.role + ' with pid: ' + arangod.pid);
992989
});
993990

@@ -1010,7 +1007,7 @@ function startInstanceCluster (instanceInfo, protocol, options,
10101007
// Didn't startup in 10 minutes? kill it, give up.
10111008
if (count > 1200) {
10121009
instanceInfo.arangods.forEach(arangod => {
1013-
killExternal(arangod.pid, abortSignal);
1010+
arangod.exitStatus = killExternal(arangod.pid, abortSignal);
10141011
analyzeServerCrash(arangod, options, 'startup timeout; forcefully terminating ' + arangod.role + ' with pid: ' + arangod.pid);
10151012
});
10161013
throw new Error('cluster startup timed out after 10 minutes!');

0 commit comments

Comments
 (0)
0