[release/1.7] Fix panic due to nil dereference cgroups v2 - #11099
Merged
AkihiroSuda merged 1 commit intoDec 9, 2024
Conversation
Member
Author
|
/test pull-containerd-node-e2e-1-7 |
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
djdongjin
force-pushed
the
cherry-pick-11069-to-1.7
branch
from
December 5, 2024 15:29
8dac58a to
a40aa60
Compare
Member
Author
|
hi @AkihiroSuda could you PTAL this cherrypick PR (since you helped review the original one :) )? thank you! |
AkihiroSuda
approved these changes
Dec 9, 2024
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
5 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 PR ports #11069 to release/1.7 (with minor modification to use
logrus).It's not cherry picked because
runtime/v2/runc/container.gowas moved tocmd/containerd-shim-runc-v2/runc/container.go, and also 1.7 is still usinglogrusinstead ofcontainerd/logpkg.