From 5e9b25b836d275a31b07ba5bd412ee859c416f2e Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Wed, 13 Jan 2016 11:53:44 -0800 Subject: [PATCH] Only warn on OOMKill disable if the feature is actually requested Instead of warning the caller who is disabling OOM killer that the feature isn't available, only warn if they are trying to **enable** OOM killer and it can't be done. Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) Upstream-commit: 5a707d94d605fdf2a35d5a7033d1971b49745352 Component: engine --- components/engine/daemon/daemon_unix.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/components/engine/daemon/daemon_unix.go b/components/engine/daemon/daemon_unix.go index 577f91b9a1..2ba7f0234f 100644 --- a/components/engine/daemon/daemon_unix.go +++ b/components/engine/daemon/daemon_unix.go @@ -275,8 +275,12 @@ func verifyContainerResources(resources *containertypes.Resources) ([]string, er logrus.Warnf("You specified a kernel memory limit on a kernel older than 4.0. Kernel memory limits are experimental on older kernels, it won't work as expected and can cause your system to be unstable.") } if resources.OomKillDisable != nil && !sysInfo.OomKillDisable { - warnings = append(warnings, "Your kernel does not support OomKillDisable, OomKillDisable discarded.") - logrus.Warnf("Your kernel does not support OomKillDisable, OomKillDisable discarded.") + // only produce warnings if the setting wasn't to *disable* the OOM Kill; no point + // warning the caller if they already wanted the feature to be off + if *resources.OomKillDisable { + warnings = append(warnings, "Your kernel does not support OomKillDisable, OomKillDisable discarded.") + logrus.Warnf("Your kernel does not support OomKillDisable, OomKillDisable discarded.") + } resources.OomKillDisable = nil }