Skip to content

[release/1.3] cherry-pick: Add bounds on max oom_score_adj value for AdjustOOMScore#4875

Merged
estesp merged 1 commit intocontainerd:release/1.3from
johnathanmdell:release/1.3
Dec 22, 2020
Merged

[release/1.3] cherry-pick: Add bounds on max oom_score_adj value for AdjustOOMScore#4875
estesp merged 1 commit intocontainerd:release/1.3from
johnathanmdell:release/1.3

Conversation

@johnathanmdell
Copy link
Copy Markdown

@johnathanmdell johnathanmdell commented Dec 22, 2020

oom_score_adj must be in the range -1000 to 1000. In AdjustOOMScore if containerd's score is already at the maximum value we should set that value for the shim instead of trying to set 1001 which is invalid.

Signed-off-by: Simon Kaegi [email protected]
(cherry picked from commit da2fd65)

@skaegi
Add bounds on max oom_score_adj value for AdjustOOMScore
ff9f916 
oom_score_adj must be in the range -1000 to 1000. In AdjustOOMScore if containerd's score is already at the maximum value we should set that value for the shim instead of trying to set 1001 which is invalid.

Signed-off-by: Simon Kaegi <[email protected]>
(cherry picked from commit da2fd65)
@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Dec 22, 2020

Hi @johnathanmdell. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

AkihiroSuda
AkihiroSuda approved these changes Dec 22, 2020 •
edited
Loading
View reviewed changes
@AkihiroSuda
Copy link
Copy Markdown
Member

AkihiroSuda commented Dec 22, 2020

Linking master PR: #4845 (merged on Dec 18)

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Dec 22, 2020

Build succeeded.

@johnathanmdell johnathanmdell mentioned this pull request Dec 22, 2020
Closed
estesp
estesp approved these changes Dec 22, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit 8046210 into containerd:release/1.3 Dec 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

needs-ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@johnathanmdell @k8s-ci-robot @AkihiroSuda @estesp @skaegi