v2: Cancel shim log ctx when ttrpc is closed#4046
Merged
estesp merged 1 commit intocontainerd:masterfrom Feb 20, 2020
Merged
Conversation
|
Build succeeded.
|
8bb3ad7 to
0ded0f6
Compare
|
Build succeeded.
|
jterry75
reviewed
Feb 20, 2020
0ded0f6 to
8bf491f
Compare
The background context aovids shim blocking when the ctx is cancelled unexpectedly during shim start. But if the shim exits unexpectedly before opening the pipe, the fd will never be closed. `onCloseWithShimLog` makes sure that the shim log fd is closed properly once the shim disconnects. Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
8bf491f to
84464b8
Compare
|
Build succeeded.
|
Codecov Report
@@ Coverage Diff @@
## master #4046 +/- ##
==========================================
- Coverage 46.1% 42.67% -3.43%
==========================================
Files 117 130 +13
Lines 11837 14778 +2941
==========================================
+ Hits 5457 6307 +850
- Misses 5462 7552 +2090
- Partials 918 919 +1
Continue to review full report at Codecov.
|
Member
|
This looks like a bug fix that would apply to |
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
4 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.
The background context aovids shim blocking when the ctx is cancelled unexpectedly during shim start (#3921). But if the shim exits unexpectedly before opening the pipe, the fd will never be closed.
onCloseWithShimLogmakes sure that the shim log fd is closed properly once the shim disconnects.Signed-off-by: Li Yuxuan liyuxuan04@baidu.com