Skip to content

[1.1 backport] Handle kmem.limit_in_bytes removal#4028

Merged
kolyshkin merged 1 commit intoopencontainers:release-1.1from
jrife:release-1.1
Sep 26, 2023
Merged

[1.1 backport] Handle kmem.limit_in_bytes removal#4028
kolyshkin merged 1 commit intoopencontainers:release-1.1from
jrife:release-1.1

Conversation

@jrife
Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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

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 PR to release-1.1 status/4-merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants