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

[1.1 backport] Handle kmem.limit_in_bytes removal #4028

Merged
merged 1 commit into from Sep 26, 2023

Conversation

jrife
Copy link
Contributor

@jrife jrife commented Sep 26, 2023

kmem.limit_in_bytes has been removed in upstream linux and this patch is queued to be backported to linux 6.1 stable:

Without this change to libcontainerd, GetStats() will return an error on the latest kernel(s). A downstream effect is that Kubernetes's kubelet does not start up. This fix was tested by ensuring that it unblocks kubelet startup when running on the latest kernel.

Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Please use git cherry-pick -x -s

kmem.limit_in_bytes has been removed in upstream linux and this patch
is queued to be backported to linux 6.1 stable:

- https://lore.kernel.org/linux-mm/20230705134434.GA156754@cmpxchg.org/T/
- https://www.spinics.net/lists/stable-commits/msg316619.html

Without this change to libcontainerd, GetStats() will return an error
on the latest kernel(s). A downstream effect is that Kubernetes's
kubelet does not start up. This fix was tested by ensuring that it
unblocks kubelet startup when running on the latest kernel.

Signed-off-by: Jordan Rife <jrife0@gmail.com>
(cherry picked from commit 99469eb)
Signed-off-by: Jordan Rife <jrife0@gmail.com>
@jrife
Copy link
Contributor Author

jrife commented Sep 26, 2023

Please use git cherry-pick -x -s

Done

@AkihiroSuda AkihiroSuda added this to the 1.1.10 milestone Sep 26, 2023
@AkihiroSuda AkihiroSuda changed the title Cherry Pick: Handle kmem.limit_in_bytes removal [1.1 backport] Handle kmem.limit_in_bytes removal Sep 26, 2023
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM

@kolyshkin kolyshkin merged commit 3854703 into opencontainers:release-1.1 Sep 26, 2023
29 checks passed
@kolyshkin kolyshkin added the backport/1.1-pr A backport to 1.1.x release. label Sep 26, 2023
@kolyshkin kolyshkin mentioned this pull request Oct 24, 2023
@cyphar cyphar mentioned this pull request Oct 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.1-pr A backport to 1.1.x release. status/4-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants