-
Notifications
You must be signed in to change notification settings - Fork 18.6k
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
daemon: don't adjust oom-score if score is 0 #41527
Conversation
This comment has been minimized.
This comment has been minimized.
ad94e7e
to
9bf2da5
Compare
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 <github@gone.nl>
@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 |
9bf2da5
to
cf7a5be
Compare
Follow up (marked as WIP, for now) in #41528 |
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
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)