flux-wreck cancel: fall back to kill -9 if job is not pending #1385
Conversation
This file contains 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
dongahn
reviewed
Mar 23, 2018
src/cmd/flux-wreck
Outdated
| elseif err == "Invalid argument" then | ||
| prog:log ("Sending SIGKILL to %d\n", id) | ||
| local rc, err = f:sendevent ({signal = 9}, "wreck.%d.kill", id) | ||
| if not rc then self:die ("signal: %s\n", err) end |
There was a problem hiding this comment.
Nice work!
If sched.cancel rpc will respond with EINVAL if the state of the target job is essentially not pending (including running and completed), hopefully there is no side effect for kill(-9) rpc.
There was a problem hiding this comment.
Yeah, I was lazy and do not check the real state of the job here. The wreck.N.kill event is ignored if the job isn't running.
There was a problem hiding this comment.
Thanks for the review @dongahn!
|
Example: |
Codecov Report
@@ Coverage Diff @@
## master #1385 +/- ##
==========================================
- Coverage 78.49% 78.49% -0.01%
==========================================
Files 162 162
Lines 29741 29741
==========================================
- Hits 23345 23344 -1
- Misses 6396 6397 +1
|
Fall back to kill -9 for running jobs in flux-wreck cancel. Fixes issue flux-framework#1379
Add -f, --force option to flux-wreck cancel to force kill with SIGKILL running jobs even when sched is not loaded.
Test --force option of flux-wreck cancel.
|
LGTM. Will merge after travis finishes. |
Closed
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.
This addresses issue #1379 with a couple minor changes to
flux wreck cancel. When sched is loaded and it getsEINVALerror,cancelwill fall back to equivalent offlux wreck kill -9on the job.I also added a
-f, --forceoption which allowsflux wreck cancelto work even if sched is not loaded, mainly so the code could be tested int2000-wreck.t.