[release/1.3] Make killing shims more resilient#4307
Merged
dmcgowan merged 1 commit intocontainerd:release/1.3from Jun 16, 2020
Merged
[release/1.3] Make killing shims more resilient#4307dmcgowan merged 1 commit intocontainerd:release/1.3from
dmcgowan merged 1 commit intocontainerd:release/1.3from
Conversation
Currently, we send a single SIGKILL to the shim process once and then we spin in a loop where we use kill(pid, 0) to detect when the pid has disappeared completely. Unfortunately, this has a race condition since pids can be reused causing us to spin in an infinite loop when that happens. This adds a timeout to this loop which logs a warning and exits the infinite loop. Signed-off-by: Ashray Jain <ashrayj@palantir.com> (cherry picked from commit 3e95727) Signed-off-by: Wei Fu <fuweid89@gmail.com>
|
Build succeeded.
|
Member
|
LGTM |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Currently, we send a single SIGKILL to the shim process
once and then we spin in a loop where we use kill(pid, 0)
to detect when the pid has disappeared completely.
Unfortunately, this has a race condition since pids can be reused causing us
to spin in an infinite loop when that happens.
This adds a timeout to this loop which logs a warning and exits the
infinite loop.
Signed-off-by: Ashray Jain ashrayj@palantir.com
(cherry picked from commit 3e95727)
Signed-off-by: Wei Fu fuweid89@gmail.com
cherry-pick: #4204
Not sure that it is good to do cherry-pick 4204. If not and we recommend user to use shim v2, I will close it. :)
cc @ashrayjain