@@ -765,13 +765,10 @@ function shutdownArangod (arangod, options, forceTerminate) {
765
765
if ( ( arangod . exitStatus === undefined ) ||
766
766
( arangod . exitStatus . status === 'RUNNING' ) ) {
767
767
if ( forceTerminate ) {
768
- killExternal ( arangod . pid , abortSignal ) ;
769
- arangod . exitStatus = {
770
- SIGNAL : String ( abortSignal )
771
- } ;
768
+ arangod . exitStatus = killExternal ( arangod . pid , abortSignal ) ;
772
769
analyzeServerCrash ( arangod , options , 'shutdown timeout; instance forcefully KILLED because of fatal timeout in testrun' ) ;
773
770
} else if ( options . useKillExternal ) {
774
- killExternal ( arangod . pid ) ;
771
+ arangod . exitStatus = killExternal ( arangod . pid ) ;
775
772
} else {
776
773
const requestOptions = makeAuthorizationHeaders ( options ) ;
777
774
requestOptions . method = 'DELETE' ;
@@ -864,7 +861,7 @@ function shutdownInstance (instanceInfo, options, forceTerminate) {
864
861
];
865
862
}
866
863
*/
867
- killExternal ( arangod . pid , abortSignal ) ;
864
+ arangod . exitStatus = killExternal ( arangod . pid , abortSignal ) ;
868
865
analyzeServerCrash ( arangod , options , 'shutdown timeout; instance forcefully KILLED after 60s - ' + arangod . exitStatus . signal ) ;
869
866
return false ;
870
867
} else {
@@ -987,7 +984,7 @@ function startInstanceCluster (instanceInfo, protocol, options,
987
984
988
985
if ( ! checkArangoAlive ( arangod , options ) ) {
989
986
instanceInfo . arangods . forEach ( arangod => {
990
- killExternal ( arangod . pid , abortSignal ) ;
987
+ arangod . exitStatus = killExternal ( arangod . pid , abortSignal ) ;
991
988
analyzeServerCrash ( arangod , options , 'startup timeout; forcefully terminating ' + arangod . role + ' with pid: ' + arangod . pid ) ;
992
989
} ) ;
993
990
@@ -1010,7 +1007,7 @@ function startInstanceCluster (instanceInfo, protocol, options,
1010
1007
// Didn't startup in 10 minutes? kill it, give up.
1011
1008
if ( count > 1200 ) {
1012
1009
instanceInfo . arangods . forEach ( arangod => {
1013
- killExternal ( arangod . pid , abortSignal ) ;
1010
+ arangod . exitStatus = killExternal ( arangod . pid , abortSignal ) ;
1014
1011
analyzeServerCrash ( arangod , options , 'startup timeout; forcefully terminating ' + arangod . role + ' with pid: ' + arangod . pid ) ;
1015
1012
} ) ;
1016
1013
throw new Error ( 'cluster startup timed out after 10 minutes!' ) ;
0 commit comments