config: Shift oomScoreAdj from linux.resources to process #789
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Needs rebase otherwise Looks good. |
wking
force-pushed
the
move-oom-adj-to-process
branch
from
99a1b8d
to
0417be6
Compare
|
travis failed |
The only discussion related to this is in [1,2], where the relationship between oomScoreAdj and disableOOMKiller is raised. But since 429f936 (Adding cgroups path to the Spec, 2015-09-02, opencontainers#137) resources has been tied to cgroups, and oomScoreAdj is not about cgroups. For example, we currently have (in config-linux.md): You can configure a container's cgroups via the resources field of the Linux configuration. I suggested we move the property from linux.resources.oomScoreAdj to linux.oomScoreAdj so config authors and runtimes don't have to worry about what cgroupsPath means if the only entry in resources is oomScoreAdj. Michael responded with [4]: If anything it should probably go on the process So that's what this commit does. I've gone with the four-space indents here to keep Pandoc happy (see 7795661 (runtime.md: Fix sub-bullet indentation, 2016-06-08, opencontainers#495), but have left the existing entries in this list unchanged to reduce churn. [1]: opencontainers#236 [2]: opencontainers#292 [3]: opencontainers#137 [4]: opencontainers#782 (comment) Signed-off-by: W. Trevor King <[email protected]>
wking
force-pushed
the
move-oom-adj-to-process
branch
from
0417be6
to
4b49c64
Compare
Fixed the JSON Schema typo with 0417be6 → 4b49c64. #785 already protecting me from myself ;). |
|
LGTM |
1 similar comment
|
LGTM |
This was referenced May 11, 2017
wking
added a commit
to wking/opencontainer-runtime-spec
that referenced
this pull request
May 18, 2017
This should have happened in 4b49c64 (config: Shift oomScoreAdj from linux.resources to process, 2017-05-09, opencontainers#789) as part of moving the property from a Linux-specific type to a cross-platform type. Signed-off-by: W. Trevor King <[email protected]>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The only discussion related to this is in #236 and #292, where the relationship between
oomScoreAdjanddisableOOMKilleris raised. But since #137 resources has been tied to cgroups, andoomScoreAdjis not about cgroups. We currently have:In #782, I suggested we move the property from
linux.resources.oomScoreAdjtolinux.oomScoreAdjso config authors and runtimes don't have to worry about whatcgroupsPathmeans if the only entry inresourcesisoomScoreAdj. @crosbymichael responded with:So that's what this commit does.
Fixes #782.