Skip to content

Remove default oom score adj#41528

Merged
cpuguy83 merged 2 commits intomoby:masterfrom
thaJeztah:remove_default_oom_score_adj
Oct 16, 2020
Merged

Remove default oom score adj#41528
cpuguy83 merged 2 commits intomoby:masterfrom
thaJeztah:remove_default_oom_score_adj

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Oct 5, 2020

Related:

- What I did

This removes the default -500 oom-score-adjust from the daemon. The test utilities are updated to keep the old default, as our tests start the daemon manually (not through systemd)

- How I did it

- How to verify it

- Description for the changelog

Remove default oom score for dockerd. When starting the daemon manually (not through systemd), users should set the `--oom-score-adjust=-500` daemon option to preserve the old behavior.

- A picture of a cute animal (not mandatory but encouraged)

Copy link
Copy Markdown
Member

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm definitely in favor of pushing this setting off to systemd and having the default in our service file instead. 👍

dockerd currently sets the oom-score-adjust itself. This functionality
was added when we did not yet run dockerd as a systemd service.

Now that we do, it's better to instead have systemd handle this.

Keeping the option itself for situations where dockerd is started
manually or without using systemd.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

rebased to get the CI fix from #41560 in

@thaJeztah thaJeztah force-pushed the remove_default_oom_score_adj branch from c259b24 to 561b801 Compare October 16, 2020 16:50
Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

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.

3 participants