[release/1.3 backport] v2: Cancel shim log ctx when ttrpc is closed#4755
Merged
mxpv merged 3 commits intocontainerd:release/1.3from Dec 11, 2020
Merged
Conversation
If the context is cancelled during `shim.Create()`, such as the client disconnects unexpectedly. The created shim will never be deleted. What's more, if the context is cancelled during `openShimLog()`, the fifo will be closed and block the shim output. Signed-off-by: Li Yuxuan <[email protected]> (cherry picked from commit d82fa43) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Related to containerd#3921 (comment) Signed-off-by: Li Yuxuan <[email protected]> (cherry picked from commit 1fb1d93) Signed-off-by: Sebastiaan van Stijn <[email protected]>
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 <[email protected]> (cherry picked from commit 84464b8) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Member
Author
|
@estesp PTAL; I saw you marked this one for backporting 😅 #4046 (comment) |
|
Build succeeded.
|
mxpv
approved these changes
Dec 11, 2020
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.
This back ports;
The first two cherry-picks were to get a clean backport, but (from the description) seem good to have