[20.10 backport] Fix setting swaplimit=true without checking#42479
Merged
thaJeztah merged 1 commit intomoby:20.10from Jul 15, 2021
Merged
[20.10 backport] Fix setting swaplimit=true without checking#42479thaJeztah merged 1 commit intomoby:20.10from
thaJeztah merged 1 commit intomoby:20.10from
Conversation
Signed-off-by: Jakub Guzik <[email protected]> (cherry picked from commit 7ef6ece) Signed-off-by: Akihiro Suda <[email protected]>
Member
Author
|
@thaJeztah @kolyshkin PTAL |
tonistiigi
approved these changes
Jul 15, 2021
cpuguy83
approved these changes
Jul 15, 2021
| } | ||
|
|
||
| info.MemoryLimit = true | ||
| info.SwapLimit = true |
Member
There was a problem hiding this comment.
I feel like the old method is a lot faster 🤣
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
6 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 #42071
- What I did
fixes #41926
- How I did it
Added one condition to moby/pkg/sysinfo/cgroup2_linux.go
- How to verify it
Actually, I wanted to create unit tests for this one. The problem is certain files must be present on FS, so I see 2 solutions:
I do not know what is the common practice in the project (1st PR), so I decided just to simply open a PR and ask.
- Description for the changelog
Fixes setting swaplimit=true without checking memory.swap.max
- A picture of a cute animal (not mandatory but encouraged)
Another time :)