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.

Sign up for GitHub

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

Jump to bottom

Stats() shouldn't assume s.container is non-nil #7517

Merged
merged 1 commit into from Oct 13, 2022
Merged

Stats() shouldn't assume s.container is non-nil #7517

merged 1 commit into from Oct 13, 2022

Conversation

kzys
Copy link
Member

@kzys kzys commented Oct 12, 2022

Like other exported methods, Stats() shouldn't assume s.container is non-nil.

Fixes #7468.

@k8s-ci-robot
Copy link

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
Stats() shouldn't assume s.container is non-nil
49a54e2 
Like other exported methods, Stats() shouldn't assume s.container is
non-nil.

Fixes containerd#7468.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
@kzys kzys marked this pull request as ready for review October 12, 2022 22:24
estesp
estesp approved these changes Oct 13, 2022
View reviewed changes
Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit 330df47 into containerd:main Oct 13, 2022
@kzys kzys added cherry-pick/1.5.x Change to be cherry picked to release/1.5 branch cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch labels Oct 17, 2022
@thaJeztah
Copy link
Member

This was already backported in;

@thaJeztah thaJeztah added cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch and removed cherry-pick/1.5.x Change to be cherry picked to release/1.5 branch cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch labels Jan 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@estesp estesp estesp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@dcantah dcantah dcantah approved these changes

Assignees
No one assigned
Labels
cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

containerd sometimes crashes with panic: runtime error: invalid memory address or nil pointer dereference
6 participants
@kzys @k8s-ci-robot @thaJeztah @estesp @AkihiroSuda @dcantah