From b0970b629b9792af87abe992065a962f9dbfa735 Mon Sep 17 00:00:00 2001 From: Doug Davis Date: Tue, 29 Nov 2016 07:38:07 -0800 Subject: [PATCH] Only show global warnings once Upon each container create I'm seeing these warning **every** time in the daemon output: ``` WARN[0002] Your kernel does not support swap memory limit WARN[0002] Your kernel does not support cgroup rt period WARN[0002] Your kernel does not support cgroup rt runtime ``` Showing them for each container.create() fills up the logs and encourages people to ignore the output being generated - which means its less likely they'll see real issues when they happen. In short, I don't think we need to show these warnings more than once, so let's only show these warnings at daemon start-up time. Signed-off-by: Doug Davis (cherry picked from commit ff42a2eb41a86217a440a1c4b2afd3c4cd1d48ac) Signed-off-by: Victor Vieux --- daemon/daemon_unix.go | 2 +- pkg/sysinfo/sysinfo_linux.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 56e980df46..72ead4ca16 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -1198,7 +1198,7 @@ func (daemon *Daemon) initCgroupsPath(path string) error { } path = filepath.Join(root, path) - sysinfo := sysinfo.New(false) + sysinfo := sysinfo.New(true) if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { return err } diff --git a/pkg/sysinfo/sysinfo_linux.go b/pkg/sysinfo/sysinfo_linux.go index 5823ff9e80..7ad84a8309 100644 --- a/pkg/sysinfo/sysinfo_linux.go +++ b/pkg/sysinfo/sysinfo_linux.go @@ -82,23 +82,23 @@ func checkCgroupMem(cgMounts map[string]string, quiet bool) cgroupMemInfo { swapLimit := cgroupEnabled(mountPoint, "memory.memsw.limit_in_bytes") if !quiet && !swapLimit { - logrus.Warn("Your kernel does not support swap memory limit.") + logrus.Warn("Your kernel does not support swap memory limit") } memoryReservation := cgroupEnabled(mountPoint, "memory.soft_limit_in_bytes") if !quiet && !memoryReservation { - logrus.Warn("Your kernel does not support memory reservation.") + logrus.Warn("Your kernel does not support memory reservation") } oomKillDisable := cgroupEnabled(mountPoint, "memory.oom_control") if !quiet && !oomKillDisable { - logrus.Warn("Your kernel does not support oom control.") + logrus.Warn("Your kernel does not support oom control") } memorySwappiness := cgroupEnabled(mountPoint, "memory.swappiness") if !quiet && !memorySwappiness { - logrus.Warn("Your kernel does not support memory swappiness.") + logrus.Warn("Your kernel does not support memory swappiness") } kernelMemory := cgroupEnabled(mountPoint, "memory.kmem.limit_in_bytes") if !quiet && !kernelMemory { - logrus.Warn("Your kernel does not support kernel memory limit.") + logrus.Warn("Your kernel does not support kernel memory limit") } return cgroupMemInfo{