-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
Conversation
This file contains 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
lifubang
approved these changes
Sep 26, 2023
AkihiroSuda
requested changes
Sep 26, 2023
There was a problem hiding this 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>
Done |
AkihiroSuda
approved these changes
Sep 26, 2023
AkihiroSuda
changed the title
Cherry Pick: Handle kmem.limit_in_bytes removal
[1.1 backport] Handle kmem.limit_in_bytes removal
Sep 26, 2023
kolyshkin
approved these changes
Sep 26, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Closed
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
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.