[release/1.5] upgrade containerd/cgroups to v1.0.3 #6961
Merged
Conversation
This file contains 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
|
Skipping CI for Draft Pull Request. |
kzys
force-pushed
the
backport-1.5-6498
branch
2 times, most recently
from
d52cb44
to
34374b2
Compare
AkihiroSuda
reviewed
May 19, 2022
runtime/opts/opts_linux.go
Outdated
| @@ -29,7 +29,7 @@ func WithNamespaceCgroupDeletion(ctx context.Context, i *namespaces.DeleteInfo) | |||
| if cgroups.Mode() == cgroups.Unified { | |||
| cg, err := cgroupsv2.LoadManager("/sys/fs/cgroup", i.Name) | |||
| if err != nil { | |||
| if err == cgroupsv2.ErrCgroupDeleted { | |||
| if err == cgroups.ErrCgroupDeleted { | |||
There was a problem hiding this comment.
because of containerd/cgroups#201
There was a problem hiding this comment.
v2: remove errors that are never returned
Unlike v1, the v2 package never returns these errors.
Do we need this if check at all then?
There was a problem hiding this comment.
Good point. Seems it only returns ErrInvalidGroupPath. Let me update the PR.
There was a problem hiding this comment.
That was the discussion on #5739
(sorry for short comment; typing from my phone)
AkihiroSuda
approved these changes
May 19, 2022
This commit brings the resource leak fix below. containerd/cgroups#212 - The original upgrade PR was containerd#6498. I didn't cherry-pick the commit due to conflicts. - ErrCgroupDeleted check is removed since LoadManager won't return the error (see containerd#5739) and the variable was removed in 1.0.3. Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
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.
This commit brings the resource leak fix below.
containerd/cgroups#212
The upgrade PR in main was #6498. I didn't cherry-pick the commit due
to conflicts.
Signed-off-by: Kazuyoshi Kato katokazu@amazon.com