From 039e9670cb6ec2f24fcce9c3ddbbfa0e75a70138 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 16 Mar 2021 16:17:22 +0900 Subject: [PATCH] info: unset cgroup-related fields when CgroupDriver == none Fix issue 42151 Signed-off-by: Akihiro Suda --- daemon/info_unix.go | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/daemon/info_unix.go b/daemon/info_unix.go index 73d5663679..704bd26c67 100644 --- a/daemon/info_unix.go +++ b/daemon/info_unix.go @@ -25,16 +25,18 @@ func (daemon *Daemon) fillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo) v.CgroupVersion = "2" } - v.MemoryLimit = sysInfo.MemoryLimit - v.SwapLimit = sysInfo.SwapLimit - v.KernelMemory = sysInfo.KernelMemory - v.KernelMemoryTCP = sysInfo.KernelMemoryTCP - v.OomKillDisable = sysInfo.OomKillDisable - v.CPUCfsPeriod = sysInfo.CPUCfs - v.CPUCfsQuota = sysInfo.CPUCfs - v.CPUShares = sysInfo.CPUShares - v.CPUSet = sysInfo.Cpuset - v.PidsLimit = sysInfo.PidsLimit + if v.CgroupDriver != cgroupNoneDriver { + v.MemoryLimit = sysInfo.MemoryLimit + v.SwapLimit = sysInfo.SwapLimit + v.KernelMemory = sysInfo.KernelMemory + v.KernelMemoryTCP = sysInfo.KernelMemoryTCP + v.OomKillDisable = sysInfo.OomKillDisable + v.CPUCfsPeriod = sysInfo.CPUCfs + v.CPUCfsQuota = sysInfo.CPUCfs + v.CPUShares = sysInfo.CPUShares + v.CPUSet = sysInfo.Cpuset + v.PidsLimit = sysInfo.PidsLimit + } v.Runtimes = daemon.configStore.GetAllRuntimes() v.DefaultRuntime = daemon.configStore.GetDefaultRuntimeName() v.InitBinary = daemon.configStore.GetInitPath()