kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #28939 from duglin/HideDupWarnings

Browse source 
Only show global warnings once
This commit is contained in:
Akihiro Suda 2016-12-06 16:12:34 +09:00 • committed by GitHub
commit e8a2c7196a
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
daemon/daemon_unix.go
View file

@ -1255,7 +1255,7 @@ func (daemon *Daemon) initCgroupsPath(path string) error {
} }
path = filepath.Join(root, path) path = filepath.Join(root, path)
sysinfo := sysinfo.New(false) sysinfo := sysinfo.New(true)
if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) { if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) {
return err return err
} }

10
pkg/sysinfo/sysinfo_linux.go
View file

@ -82,23 +82,23 @@ func checkCgroupMem(cgMounts map[string]string, quiet bool) cgroupMemInfo {
swapLimit := cgroupEnabled(mountPoint, "memory.memsw.limit_in_bytes") swapLimit := cgroupEnabled(mountPoint, "memory.memsw.limit_in_bytes")
if !quiet && !swapLimit { 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") memoryReservation := cgroupEnabled(mountPoint, "memory.soft_limit_in_bytes")
if !quiet && !memoryReservation { 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") oomKillDisable := cgroupEnabled(mountPoint, "memory.oom_control")
if !quiet && !oomKillDisable { 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") memorySwappiness := cgroupEnabled(mountPoint, "memory.swappiness")
if !quiet && !memorySwappiness { 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") kernelMemory := cgroupEnabled(mountPoint, "memory.kmem.limit_in_bytes")
if !quiet && !kernelMemory { 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{ return cgroupMemInfo{