Skip to content

libcontainerd/supervisor: remove remnants of adjusting oom-score#48252

Merged
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:remove_oom_leftovers
Jul 29, 2024
Merged

libcontainerd/supervisor: remove remnants of adjusting oom-score#48252
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:remove_oom_leftovers

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Jul 26, 2024

libcontainerd/supervisor: remove remnants of adjusting oom-score

In docker versions before v24.0, the dockerd daemon allowed adjusting its own oom-score; in that case we would forward the configuration to containerd (when running as child process) for it to do the same.

This feature was deprecated in 5a922dc, and removed in fb96b94, but some fields were left behind in the supervisor package.

This patch removes the oomScore field and adjustOOMScore method from the remove type.

@thaJeztah thaJeztah added status/2-code-review area/daemon Core Engine kind/refactor PR's that refactor, or clean-up code labels Jul 26, 2024
@thaJeztah thaJeztah added this to the 28.0.0 milestone Jul 26, 2024
@thaJeztah thaJeztah self-assigned this Jul 26, 2024
@thaJeztah thaJeztah force-pushed the remove_oom_leftovers branch from 45987f3 to 423b243 Compare July 26, 2024 22:19
@thaJeztah thaJeztah force-pushed the remove_oom_leftovers branch from 423b243 to 5a96407 Compare July 29, 2024 14:10
@thaJeztah thaJeztah marked this pull request as ready for review July 29, 2024 14:10
@thaJeztah thaJeztah force-pushed the remove_oom_leftovers branch from 5a96407 to 8b5d211 Compare July 29, 2024 14:16
In docker versions before v24.0, the dockerd daemon allowed adjusting
its own oom-score; in that case we would forward the configuration to
containerd (when running as child process) for it to do the same.

This feature was deprecated in 5a922dc,
and removed in fb96b94, but some fields
were left behind in the supervisor package.

This patch removes the oomScore field and adjustOOMScore method from
the remove type.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the remove_oom_leftovers branch from 8b5d211 to 96762a2 Compare July 29, 2024 14:34
@thaJeztah thaJeztah merged commit 4742c06 into moby:master Jul 29, 2024
@thaJeztah thaJeztah deleted the remove_oom_leftovers branch July 29, 2024 17:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/daemon Core Engine kind/refactor PR's that refactor, or clean-up code status/2-code-review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants