[release/1.6] cri: fix memory.memsw.limit_in_bytes: no such file or directory#7838
Merged
dmcgowan merged 1 commit intocontainerd:release/1.6from Dec 19, 2022
Merged
Conversation
dcantah
approved these changes
Dec 19, 2022
Member
|
I think you can just squash commits to avoid having non-compilable commit. |
Skip automatic `if swapLimit == 0 { s.Linux.Resources.Memory.Swap = &limit }` when the swap controller is missing.
(default on Ubuntu 20.04)
Fix issue 7828 (regression in PR 7783 "cri: make swapping disabled with memory limit")
Cherry-Pick was not cleaned, required updated cgroups library from v1.0.3 to v1.0.4
Signed-off-by: Akihiro Suda <[email protected]>
(cherry picked from commit 4157503)
Signed-off-by: Derek McGowan <[email protected]>
dmcgowan
force-pushed
the
1.6-fix-memory-swap-regression
branch
from
52d83b8 to
53c733e
Compare
AkihiroSuda
approved these changes
Dec 19, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Cherry-pick #7836
Skip automatic
if swapLimit == 0 { s.Linux.Resources.Memory.Swap = &limit }when the swap controller is missing. (default on Ubuntu 20.04)Fix issue 7828 (regression in PR 7783 "cri: make swapping disabled with memory limit")
Signed-off-by: Akihiro Suda [email protected]
(cherry picked from commit 4157503)
Signed-off-by: Derek McGowan [email protected]