Bugfix/fix test arangod shutdown command #3260
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…er, use it to send a shutdown signal to the SUT. If not, fall back to using a download http request.
jsteemann
suggested changes
Sep 15, 2017
| @@ -758,6 +758,18 @@ function shutdownArangod (arangod, options, forceTerminate) { | |||
| } else if (options.useKillExternal) { | |||
| killExternal(arangod.pid); | |||
| } else { | |||
| if (arango.isConnected) { | |||
jsteemann
approved these changes
Sep 15, 2017
fceller
reviewed
Sep 20, 2017
| return; | ||
| } catch (x) { | ||
| print('failed to shut down arangod via our connection!'); | ||
| print(x); |
There was a problem hiding this comment.
@dothebart Why not use killExternal in case of failure?
ObiWahn
added a commit
that referenced
this pull request
Sep 29, 2017
…ult-cache * origin: (85 commits) rework process handling (#3322) Bug fix/agency compactor deadlock (#3335) restore the feature to be able to specify the CXX via the environment. (#3340) try to work around some assertions (#3296) Feature/jenkins pipeline (#3338) Feature/switch to 3.3 (#3336) Bug fix/sort out agency locks (#3306) Revert "shut 7E87 down the second instance properly (#3332)" Revert "Bugfix/fix test arangod shutdown command (#3260)" fixed duplicate variable fixed links in results.html overview fixed jslint fixed missing cleanBuild check shut down the second instance properly (#3332) Feature/jenkins pipeline (#3327) increase default value for /proc/sys/vm/max_map_count (#3321) show warnings if curl work thread is blocked by error/success cbs (#3316) During the startup of arangod the client will fail to connect. (#3302) set minimum required GCC version to 5.4 (#3298) Feature/mmfiles hash lookup performance (#3265) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Windows may not wait long enough after using killExternal to shut down arangodb and tests may fail.