Skip to content

[release/1.7] Fix panic due to nil dereference cgroups v2#11099

Merged
AkihiroSuda merged 1 commit intocontainerd:release/1.7from
djdongjin:cherry-pick-11069-to-1.7
Dec 9, 2024
Merged

[release/1.7] Fix panic due to nil dereference cgroups v2#11099
AkihiroSuda merged 1 commit intocontainerd:release/1.7from
djdongjin:cherry-pick-11069-to-1.7

Conversation

@djdongjin
Copy link
Copy Markdown
Member

@djdongjin djdongjin commented Dec 5, 2024

This PR ports #11069 to release/1.7 (with minor modification to use logrus).

It's not cherry picked because runtime/v2/runc/container.go was moved to cmd/containerd-shim-runc-v2/runc/container.go, and also 1.7 is still using logrus instead of containerd/log pkg.

@djdongjin
Copy link
Copy Markdown
Member Author

/test pull-containerd-node-e2e-1-7

@djdongjin djdongjin force-pushed the cherry-pick-11069-to-1.7 branch from 8dac58a to a40aa60 Compare December 5, 2024 15:29
Copy link
Copy Markdown
Member

@austinvazquez austinvazquez left a comment

Choose a reason for hiding this comment

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

LGTM on green.

@djdongjin
Copy link
Copy Markdown
Member Author

hi @AkihiroSuda could you PTAL this cherrypick PR (since you helped review the original one :) )? thank you!

@AkihiroSuda AkihiroSuda merged commit 96b11e2 into containerd:release/1.7 Dec 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants