daemon: don't adjust oom-score if score is 0#41527
Merged
tiborvass merged 1 commit intomoby:masterfrom Oct 15, 2020
Merged
Conversation
This comment has been minimized.
This comment has been minimized.
thaJeztah
force-pushed
the
no_oom_score_adj
branch
from
ad94e7e to
9bf2da5
Compare
Member
|
I would argue that we should take this out and handle it in the process supervisor.... but we could also just not error out here. |
This patch makes two changes if --oom-score-adj is set to 0 - do not adjust the oom-score-adjust cgroup for dockerd - do not set the hard-coded -999 score for containerd if containerd is running as child process Before this change: oom-score-adj | dockerd | containerd as child-process --------------|---------------|---------------------------- - | -500 | -500 (same as dockerd) -100 | -100 | -100 (same as dockerd) 0 | 0 | -999 (hard-coded default) With this change: oom-score-adj | dockerd | containerd as child-process --------------|---------------|---------------------------- - | -500 | -500 (same as dockerd) -100 | -100 | -100 (same as dockerd) 0 | not adjusted | not adjusted Signed-off-by: Sebastiaan van Stijn <[email protected]>
Member
Author
|
@cpuguy83 yes, I was already preparing a PR to remove the default Oh! I had a more descriptive commit-message that I didn't push; let me do so |
thaJeztah
force-pushed
the
no_oom_score_adj
branch
from
9bf2da5 to
cf7a5be
Compare
Member
Author
|
Follow up (marked as WIP, for now) in #41528 |
tiborvass
approved these changes
Oct 15, 2020
This was referenced Mar 23, 2021
This was referenced Apr 12, 2023
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
3 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.
relates to / addresses docker/for-linux#1120
This patch makes two changes if --oom-score-adj is set to 0
containerd is running as child process
Before this change:
With this change:
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)