vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Fix sysinfo regression

Browse source 
The cleanup to sysinfo package introduced a regression.

If memory cgroup isn't supported and --memory is specified when
starting a container, we should return info instead of nil in
checkCgroupMem(), otherwise we'll access a nil pointer.

Signed-off-by: Zefan Li <lizefan@huawei.com>
This commit is contained in:
Zefan Li 2015-06-19 09:44:23 +08:00
parent ba6ba05e8e
commit f4c0d06103
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sysinfo/sysinfo_linux.go
View file

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