From 153f13c9efc14c7e293e4ed54abdb97ff01d3f99 Mon Sep 17 00:00:00 2001 From: ChengTiesheng Date: Thu, 29 Oct 2015 11:36:03 +0800 Subject: [PATCH 1/2] runtime-config-linux: clarify oom_score_adj Signed-off-by: ChengTiesheng --- runtime-config-linux.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/runtime-config-linux.md b/runtime-config-linux.md index 1fff724cc..8e292f5bb 100644 --- a/runtime-config-linux.md +++ b/runtime-config-linux.md @@ -180,7 +180,11 @@ For more information, see [the memory cgroup man page](https://www.kernel.org/do #### Set oom_score_adj -More information on `oom_score_adj` available [here](https://www.kernel.org/doc/Documentation/filesystems/proc.txt). +oom_score_adj works with disableOOMKiller. If out-of-memory killer enabled("disableOOMKiller": false), oom_score_adj can be set to adjust the oom-killer score, the value of oom_score_adj is added to the badness score before it is used to determine which task to kill. If out-of-memory killer disabled("disableOOMKiller": true), the value of oom_score_adj is useless and will be omitted. For more information, see [the proc filesystem man page](https://www.kernel.org/doc/Documentation/filesystems/proc.txt). + +* **`oomScoreAdj`** *(int, optional)* - adjust the oom-killer score + +###### Example ```json "oomScoreAdj": 0 From 011acdfc730976054acbae6ce8221177636e1eec Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Tue, 5 Jan 2016 10:40:38 -0500 Subject: [PATCH 2/2] runtime-config: defer description to linux docs Signed-off-by: Vincent Batts --- runtime-config-linux.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/runtime-config-linux.md b/runtime-config-linux.md index 8e292f5bb..ae6300b52 100644 --- a/runtime-config-linux.md +++ b/runtime-config-linux.md @@ -180,7 +180,10 @@ For more information, see [the memory cgroup man page](https://www.kernel.org/do #### Set oom_score_adj -oom_score_adj works with disableOOMKiller. If out-of-memory killer enabled("disableOOMKiller": false), oom_score_adj can be set to adjust the oom-killer score, the value of oom_score_adj is added to the badness score before it is used to determine which task to kill. If out-of-memory killer disabled("disableOOMKiller": true), the value of oom_score_adj is useless and will be omitted. For more information, see [the proc filesystem man page](https://www.kernel.org/doc/Documentation/filesystems/proc.txt). +`oomScoreAdj` sets heuristic regarding how the process is evaluated by the kernel during memory pressure. +For more information, see [the proc filesystem documentation section 3.1](https://www.kernel.org/doc/Documentation/filesystems/proc.txt). +This is a kernel/system level setting, where as `disableOOMKiller` is scoped for a memory cgroup. +For more information on how these two settings work together, see [the memory cgroup documentation section 10. OOM Contol](https://www.kernel.org/doc/Documentation/cgroups/memory.txt). * **`oomScoreAdj`** *(int, optional)* - adjust the oom-killer score