[release/1.1] cherry-pick: modify lock location of exec delete avoid exec hang#2757
Merged
crosbymichael merged 1 commit intocontainerd:release/1.1from Nov 2, 2018
Merged
Conversation
func (e *execProcess) delete(ctx context.Context) error {
e.wg.Wait()
...
}
delete exec process will wait for io copy finish, if wait here,
other process can not get lock of shim service.
1. apply lock around s.transition() calls in the Delete methods.
2. put lock after wait io copy in exec Delete.
Signed-off-by: Ace-Tang <aceapril@126.com>
Codecov Report
@@ Coverage Diff @@
## release/1.1 #2757 +/- ##
============================================
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
Author
|
For #2709 |
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.
Backport #2624 to release/1.1.
For issues like #2438.
Exec deletion can take forever if the exec leaks processes in the container. This will cause:
containerd-shimandcri;This doesn't fix 1) and 2), but it does fix 3).
In any case,
containerd-shimshouldn't hang, so that users can at least stop the bad container.@lbernail @Ace-Tang