[release/1.1] Backport #250 and #252#258
Merged
AkihiroSuda merged 2 commits intocontainerd:release/1.1from Nov 12, 2022
Merged
Conversation
retryingWriteFile was a simple wrapper around os.WriteFile to retry writes on EINTR. This was added due to change in the go runtime causing more EINTRs to occur, more here: golang/go#38033 However since 1.15 the stdlib automatically retries IO on EINTR, and since this package uses things from go 1.16, all consumers of this pkg should be on > 1.15 making the wrapper redundant. Signed-off-by: Danny Canter <[email protected]> (cherry picked from commit b05ee03)
There is a race condition while adding a brand-new process to cgroups.procs. Like runc, we should retry on EINVAL. We have seen the issue a lot on containerd's Rocky Linux build. containerd/containerd#7532 Signed-off-by: Kazuyoshi Kato <[email protected]> (cherry picked from commit 4c85060)
Member
Author
|
We can use 1.1 in containerd 1.6.x and 1.5.x. |
AkihiroSuda
approved these changes
Nov 12, 2022
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
3 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.
#250 is a bug fix. #252 is clean up but it is low-risk and cherry-picking #250 straightforward.