Skip to content
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

generate: do not set OOMScoreAdj if no adjustment #116

Merged
merged 2 commits into from
Oct 23, 2024

Conversation

samuelkarp
Copy link
Member

@samuelkarp samuelkarp commented Oct 23, 2024

Existing OOMScoreAdj on the incoming spec should not be cleared.

Fixes #117

@samuelkarp samuelkarp changed the title wip: generate: add test for oom score adj generate: do not set OOMScoreAdj if no adjustment Oct 23, 2024
@samuelkarp samuelkarp marked this pull request as ready for review October 23, 2024 18:43
@samuelkarp
Copy link
Member Author

/cc @mikebrow

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM
Thanks!

Copy link
Member

@dims dims left a comment

Choose a reason for hiding this comment

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

LGTM

Existing OOMScoreAdj on the incoming spec should not be cleared.

Fixes containerd#117

Signed-off-by: Samuel Karp <[email protected]>
The generator should not clear an existing OOMScoreAdj if no adjustment
is performed.

Signed-off-by: Samuel Karp <[email protected]>
@samuelkarp
Copy link
Member Author

samuelkarp commented Oct 23, 2024

samuelkarp force-pushed the oom-score-adj branch from 555a15b to 07bfc18

Reordered commits and removed the "wip" from the commit message with the test

@mikebrow
Copy link
Member

i’m fine with not being able to unset for now.. we can figure that out in a follow up, after we ensure we are not accidentally unsetting ...

@samuelkarp samuelkarp merged commit edfd91b into containerd:main Oct 23, 2024
8 checks passed
@samuelkarp samuelkarp deleted the oom-score-adj branch October 23, 2024 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OOMScoreAdj is incorrectly cleared even if no plugin performs an adjustment
3 participants