浏览代码

Merge pull request #14032 from lizf-os/fix-sysinfo-regression

Fix sysinfo regression
Alexander Morozov 10 年之前
父节点
当前提交
3ee67caf3b
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      pkg/sysinfo/sysinfo_linux.go

+ 2 - 2
pkg/sysinfo/sysinfo_linux.go

@@ -38,7 +38,7 @@ func checkCgroupMem(quiet bool) *cgroupMemInfo {
 		if !quiet {
 		if !quiet {
 			logrus.Warnf("Your kernel does not support cgroup memory limit: %v", err)
 			logrus.Warnf("Your kernel does not support cgroup memory limit: %v", err)
 		}
 		}
-		return nil
+		return info
 	}
 	}
 	info.MemoryLimit = true
 	info.MemoryLimit = true
 
 
@@ -61,7 +61,7 @@ func checkCgroupCpu(quiet bool) *cgroupCpuInfo {
 		if !quiet {
 		if !quiet {
 			logrus.Warn(err)
 			logrus.Warn(err)
 		}
 		}
-		return nil
+		return info
 	}
 	}
 
 
 	info.CpuCfsPeriod = cgroupEnabled(mountPoint, "cpu.cfs_period_us")
 	info.CpuCfsPeriod = cgroupEnabled(mountPoint, "cpu.cfs_period_us")