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

config-linux: RFC 2119 wording for oomScoreAdj #781

Merged
merged 1 commit into from
May 9, 2017

Conversation

wking
Copy link
Contributor

@wking wking commented Apr 26, 2017

The previous wording hinted at, but did not require, this setting to be implemented via oom_score_adj. With the new wording, when proc is mounted at /proc, the container process can check this value by looking at /proc/self/oom_score_adj.

Part of #746.

config-linux.md Outdated
For more information, see [the proc filesystem documentation section 3.1][procfs].
* **`oomScoreAdj`** *(int, OPTIONAL)* adjusts the oom-killer score in `[pid]/oom_score_adj` for the container process's `[pid]` in a [proc pseudo-filesystem][procfs].
If `oomScoreAdj` is set, the runtime MUST set `oom_score_adj` to the given value.
If `oomScoreAdj` is not set, the runtime MUST not change the value of `oom_score_adj`.
Copy link
Contributor

Choose a reason for hiding this comment

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

s/MUST not/MUST NOT

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed with e7fdcb8e9a39e7, which also rebases onto master.

@wking wking force-pushed the oomScoreAdj-rfc-2119 branch from e7fdcb8 to e9a39e7 Compare May 9, 2017 16:28
The previous wording hinted at, but did not require, this setting to
be implemented via oom_score_adj.  With the new wording, when proc is
mounted at /proc, the container process can check this value by
looking at /proc/self/oom_score_adj.

Signed-off-by: W. Trevor King <wking@tremily.us>
@crosbymichael
Copy link
Member

crosbymichael commented May 9, 2017

LGTM

Approved with PullApprove

1 similar comment
@mrunalp
Copy link
Contributor

mrunalp commented May 9, 2017

LGTM

Approved with PullApprove

@mrunalp mrunalp merged commit 01ec62d into opencontainers:master May 9, 2017
@wking wking deleted the oomScoreAdj-rfc-2119 branch May 9, 2017 23:49
@vbatts vbatts mentioned this pull request Jul 5, 2017
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.

4 participants