Skip to content

daemon: remove --oom-score-adjust flag#46113

Merged
thaJeztah merged 1 commit intomoby:masterfrom
akerouanton:remove-deprecated-oom-score-adjust
Jan 20, 2024
Merged

daemon: remove --oom-score-adjust flag#46113
thaJeztah merged 1 commit intomoby:masterfrom
akerouanton:remove-deprecated-oom-score-adjust

Conversation

@akerouanton
Copy link
Copy Markdown
Member

@akerouanton akerouanton commented Jul 29, 2023

- What I did

This flag was marked as deprecated in commit 5a922dc (released in v24.0) and to be removed in the next release.

- Description for the changelog

  • The daemon flag --oom-score-adjust has been deprecated in v24.0 and is now removed.

flags.StringVar(&conf.CgroupParent, "cgroup-parent", "", "Set parent cgroup for all containers")
flags.StringVar(&conf.RemappedRoot, "userns-remap", "", "User/Group setting for user namespaces")
flags.BoolVar(&conf.LiveRestoreEnabled, "live-restore", false, "Enable live restore of docker when containers are still running")
// TODO(thaJeztah): Used to produce a deprecation error; remove the flag and the OOMScoreAdjust field for the next release after v25.0.0.
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This comment suggests it should be dropped in v26.0, whereas the docs suggests it should be dropped in v25.0 (cf. https://docs.docker.com/engine/deprecated/#oom-score-adjust-for-the-daemon).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah, yes, so;

So this PR should wait until after v25.0.0; the idea here is to produce a "more meaningful" error than

Status: unknown flag: --oom-score-adjust
See 'dockerd --help'., Code: 125

So I guess we should put this PR on the "future" milestone, and keep it in draft until we started a "25.0" release branch

@thaJeztah thaJeztah added this to the v-future milestone Jul 29, 2023
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

See my comment above (changes look good, but need to wait for a bit 😄)

@akerouanton
Copy link
Copy Markdown
Member Author

I'm converting this PR into a draft until we have a 25.0 branch.

@akerouanton akerouanton marked this pull request as draft August 1, 2023 08:53
@thaJeztah thaJeztah modified the milestones: v-future, 26.0.0 Jan 19, 2024
This flag was marked deprecated in commit 5a922dc (released in v24.0)
and to be removed in the next release.

Signed-off-by: Albin Kerouanton <[email protected]>
@thaJeztah thaJeztah force-pushed the remove-deprecated-oom-score-adjust branch from f7d5d36 to f07c45e Compare January 19, 2024 23:43
@thaJeztah thaJeztah marked this pull request as ready for review January 19, 2024 23:44
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah 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.

2 participants