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

Add oom_score_adj to set default oom score adj #1367

Merged
merged 1 commit into from
Mar 15, 2023

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Mar 15, 2023

No description provided.

@rhatdan
Copy link
Member Author

rhatdan commented Mar 15, 2023

@vrothberg @giuseppe @TomSweeneyRedHat @mheon @containers/podman-maintainers PTAL

Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 15, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@@ -184,6 +184,10 @@ type ContainersConfig struct {
// NoHosts tells container engine whether to create its own /etc/hosts
NoHosts bool `toml:"no_hosts,omitempty"`

// OOMScoreAdj tunes the host's OOM preferences for containers
// (accepts values from -1000 to 1000).
OOMScoreAdj int `toml:"oom_score_adj,omitempty,omitzero"`
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
OOMScoreAdj int `toml:"oom_score_adj,omitempty,omitzero"`
OOMScoreAdj *int `toml:"oom_score_adj,omitempty,omitzero"`

AFAICT 0 is a valid value, so we need a way to see a difference between value not set and set to 0 by a user.

see containers/podman@164b64e

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@rhatdan
Copy link
Member Author

rhatdan commented Mar 15, 2023

@containers/podman-maintainers PTAL

Copy link
Member

@ashley-cui ashley-cui left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Mar 15, 2023
@openshift-merge-robot openshift-merge-robot merged commit 1eabdef into containers:main Mar 15, 2023
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.

5 participants