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

Commit d2b62c9

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

File tree

6 files changed

+437
-622
lines changed

6 files changed

+437
-622
lines changed

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -765,10 +765,13 @@ function shutdownArangod (arangod, options, forceTerminate) {
765765
if ((arangod.exitStatus === undefined) ||
766766
(arangod.exitStatus.status === 'RUNNING')) {
767767
if (forceTerminate) {
768-
arangod.exitStatus = killExternal(arangod.pid, abortSignal);
768+
killExternal(arangod.pid, abortSignal);
769+
arangod.exitStatus = {
770+
SIGNAL: String(abortSignal)
771+
};
769772
analyzeServerCrash(arangod, options, 'shutdown timeout; instance forcefully KILLED because of fatal timeout in testrun');
770773
} else if (options.useKillExternal) {
771-
arangod.exitStatus = killExternal(arangod.pid);
774+
killExternal(arangod.pid);
772775
} else {
773776
const requestOptions = makeAuthorizationHeaders(options);
774777
requestOptions.method = 'DELETE';
@@ -861,7 +864,7 @@ function shutdownInstance (instanceInfo, options, forceTerminate) {
861864
];
862865
}
863866
*/
864-
arangod.exitStatus = killExternal(arangod.pid, abortSignal);
867+
killExternal(arangod.pid, abortSignal);
865868
analyzeServerCrash(arangod, options, 'shutdown timeout; instance forcefully KILLED after 60s - ' + arangod.exitStatus.signal);
866869
return false;
867870
} else {
@@ -984,7 +987,7 @@ function startInstanceCluster (instanceInfo, protocol, options,
984987

985988
if (!checkArangoAlive(arangod, options)) {
986989
instanceInfo.arangods.forEach(arangod => {
987-
arangod.exitStatus = killExternal(arangod.pid, abortSignal);
990+
killExternal(arangod.pid, abortSignal);
988991
analyzeServerCrash(arangod, options, 'startup timeout; forcefully terminating ' + arangod.role + ' with pid: ' + arangod.pid);
989992
});
990993

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

0 commit comments

Comments
 (0)
0