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

[release/1.6] cri: make swapping disabled with memory limit #7815

Merged
merged 1 commit into from Dec 14, 2022

Conversation

mqasimsarfraz
Copy link
Contributor

@mqasimsarfraz mqasimsarfraz commented Dec 14, 2022

OCI runtime spec defines memory.swap as 'limit of memory+Swap usage'
so setting them to equal should disable the swap. Also, this change
should make containerd behaviour same as other runtimes e.g
'cri-dockerd/dockershim' and won't be impacted when user turn on
'NodeSwap' (kubernetes/enhancements#2400) feature.

Signed-off-by: Qasim Sarfraz <qasimsarfraz@microsoft.com>
(cherry picked from commit 69975b9)
Signed-off-by: Qasim Sarfraz <qasimsarfraz@microsoft.com>
@k8s-ci-robot
Copy link

Hi @mqasimsarfraz. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

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 64fa4a0 into containerd:release/1.6 Dec 14, 2022
mqasimsarfraz added a commit to inspektor-gadget/inspektor-gadget that referenced this pull request Jan 30, 2023
Bring in the fix (containerd/containerd#7815)
related to swap limit in containerd by upgrading minikube to v1.29.0
(containerd 1.6.15).
mqasimsarfraz added a commit to inspektor-gadget/inspektor-gadget that referenced this pull request Jan 30, 2023
Bring in the fix (containerd/containerd#7815)
related to swap limit in containerd by upgrading minikube to v1.29.0
(containerd 1.6.15).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants