fix race in exec delete and start(release/1.1)#2834
Merged
estesp merged 1 commit intocontainerd:release/1.1from Nov 26, 2018
Merged
fix race in exec delete and start(release/1.1)#2834estesp merged 1 commit intocontainerd:release/1.1from
estesp merged 1 commit intocontainerd:release/1.1from
Conversation
Signed-off-by: Lifubang <[email protected]>
Codecov Report
@@ Coverage Diff @@
## release/1.1 #2834 +/- ##
============================================
Coverage 48.99% 48.99%
============================================
Files 85 85
Lines 7603 7603
============================================
Hits 3725 3725
Misses 3203 3203
Partials 675 675
Continue to review full report at Codecov.
|
Member
|
LGTM |
Member
|
Is this also needed for the 1.2 and 1.0 branches? |
Contributor
Author
1.2 doesn't need this patch, but need #2826. |
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
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.
I don't know whether the release/1.1 is still receiving new PR or not. If not, feel free to close this PR.
As mentioned in #2826
Of course, we will meet this race in a very small probability.
There is an example:
Add a time sleep in func 'delete' and 'start' in file exec.go;
https://github.com/acmcodercom/containerd/blob/raceexample/linux/proc/exec.go#L95-L108
https://github.com/acmcodercom/containerd/blob/raceexample/linux/proc/exec.go#L194-L202
Start a container;
ctr --address /run/docker/containerd/containerd.sock run -d docker.io/library/redis:alpine rediscreate, delete and start a exec:
go run testexecrace.gocat testexecrace.goin runc, it is also running:
testexec,pid is also be deleted:
and can't be killed:
I think we can move the lock location when the state of execProcess is execStoppedState, but cant' when the state is execCreatedState. So, we should revert it in
func (s *execCreatedState) Delete(ctx context.Context).Signed-off-by: Lifubang [email protected]