Merge pull request #15879 from Mashimiao/add-support-blkio_throtte_iops

Add support for blkio read/write iops device

sysinfo/sysinfo.go

@@ -69,6 +69,12 @@ type cgroupBlkioInfo struct {
 
 	// Whether Block IO write limit in bytes per second is supported or not
 	BlkioWriteBpsDevice bool
+
+	// Whether Block IO read limit in IO per second is supported or not
+	BlkioReadIOpsDevice bool
+
+	// Whether Block IO write limit in IO per second is supported or not
+	BlkioWriteIOpsDevice bool
 }
 
 type cgroupCpusetInfo struct {

sysinfo/sysinfo_linux.go

@@ -136,11 +136,22 @@ func checkCgroupBlkioInfo(quiet bool) cgroupBlkioInfo {
 	if !quiet && !writeBpsDevice {
 		logrus.Warn("Your kernel does not support cgroup blkio throttle.write_bps_device")
 	}
+	readIOpsDevice := cgroupEnabled(mountPoint, "blkio.throttle.read_iops_device")
+	if !quiet && !readIOpsDevice {
+		logrus.Warn("Your kernel does not support cgroup blkio throttle.read_iops_device")
+	}
+
+	writeIOpsDevice := cgroupEnabled(mountPoint, "blkio.throttle.write_iops_device")
+	if !quiet && !writeIOpsDevice {
+		logrus.Warn("Your kernel does not support cgroup blkio throttle.write_iops_device")
+	}
 	return cgroupBlkioInfo{
-		BlkioWeight:         weight,
+		BlkioWeight:          weight,
-		BlkioWeightDevice:   weightDevice,
+		BlkioWeightDevice:    weightDevice,
-		BlkioReadBpsDevice:  readBpsDevice,
+		BlkioReadBpsDevice:   readBpsDevice,
-		BlkioWriteBpsDevice: writeBpsDevice,
+		BlkioWriteBpsDevice:  writeBpsDevice,
+		BlkioReadIOpsDevice:  readIOpsDevice,
+		BlkioWriteIOpsDevice: writeIOpsDevice,
 	}
 }