From b6a6a356848b3aade535a9234e1ff45059182ae3 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 20 Jan 2021 13:42:32 +0900 Subject: [PATCH] docker info: adjust warning strings for cgroup v2 Signed-off-by: Akihiro Suda (cherry picked from commit 00225e220fb18283dcf9e4fa6625fad6746d8a50) Signed-off-by: Akihiro Suda --- daemon/info_unix.go | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/daemon/info_unix.go b/daemon/info_unix.go index 1b25b51266..56c920990b 100644 --- a/daemon/info_unix.go +++ b/daemon/info_unix.go @@ -130,22 +130,38 @@ func (daemon *Daemon) fillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo) // blkio weight is not available on cgroup v1 since kernel 5.0. // Warning is not printed on cgroup v1, because there is no action user can take. // On cgroup v2, blkio weight is implemented using io.weight - v.Warnings = append(v.Warnings, "WARNING: No blkio weight support") + v.Warnings = append(v.Warnings, "WARNING: No io.weight support") } if !sysInfo.BlkioWeightDevice && v.CgroupVersion == "2" { - v.Warnings = append(v.Warnings, "WARNING: No blkio weight_device support") + v.Warnings = append(v.Warnings, "WARNING: No io.weight (per device) support") } if !sysInfo.BlkioReadBpsDevice { - v.Warnings = append(v.Warnings, "WARNING: No blkio throttle.read_bps_device support") + if v.CgroupVersion == "2" { + v.Warnings = append(v.Warnings, "WARNING: No io.max (rbps) support") + } else { + v.Warnings = append(v.Warnings, "WARNING: No blkio throttle.read_bps_device support") + } } if !sysInfo.BlkioWriteBpsDevice { - v.Warnings = append(v.Warnings, "WARNING: No blkio throttle.write_bps_device support") + if v.CgroupVersion == "2" { + v.Warnings = append(v.Warnings, "WARNING: No io.max (wbps) support") + } else { + v.Warnings = append(v.Warnings, "WARNING: No blkio throttle.write_bps_device support") + } } if !sysInfo.BlkioReadIOpsDevice { - v.Warnings = append(v.Warnings, "WARNING: No blkio throttle.read_iops_device support") + if v.CgroupVersion == "2" { + v.Warnings = append(v.Warnings, "WARNING: No io.max (riops) support") + } else { + v.Warnings = append(v.Warnings, "WARNING: No blkio throttle.read_iops_device support") + } } if !sysInfo.BlkioWriteIOpsDevice { - v.Warnings = append(v.Warnings, "WARNING: No blkio throttle.write_iops_device support") + if v.CgroupVersion == "2" { + v.Warnings = append(v.Warnings, "WARNING: No io.max (wiops) support") + } else { + v.Warnings = append(v.Warnings, "WARNING: No blkio throttle.write_iops_device support") + } } } if !v.IPv4Forwarding {