Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/1.5] upgrade containerd/cgroups to v1.0.3 #6961

Merged
merged 1 commit into from May 20, 2022

Conversation

kzys
Copy link
Member

@kzys kzys commented May 19, 2022

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

@k8s-ci-robot
Copy link
Collaborator

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kzys kzys force-pushed the backport-1.5-6498 branch 2 times, most recently from d52cb44 to 34374b2 Compare May 19, 2022 16:36
@kzys kzys marked this pull request as ready for review May 19, 2022 16:39
@@ -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 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Member Author

@kzys kzys May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Member Author

@kzys kzys May 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was the discussion on #5739

(sorry for short comment; typing from my phone)

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>
Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kzys kzys merged commit 51f20c0 into containerd:release/1.5 May 20, 2022
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants