Skip to content

fixes for pkg/sysinfo/checkCgroupPids #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
giuseppe merged 2 commits into from
May 23, 2020
Merged

fixes for pkg/sysinfo/checkCgroupPids #162

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7317e00
pkg/sysinfo: fix error path in checkCgroupPids
kolyshkin May 23, 2020
6b5ae78
pkg/sysinfo/checkCgroupPids: speedup
kolyshkin May 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions pkg/sysinfo/sysinfo_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func New(quiet bool) *SysInfo {
sysInfo.cgroupCPUInfo = checkCgroupCPU(cgMounts, quiet)
sysInfo.cgroupBlkioInfo = checkCgroupBlkioInfo(cgMounts, quiet)
sysInfo.cgroupCpusetInfo = checkCgroupCpusetInfo(cgMounts, quiet)
sysInfo.cgroupPids = checkCgroupPids(quiet)
sysInfo.cgroupPids = checkCgroupPids(cgMounts, quiet)
}

_, ok := cgMounts["devices"]
Expand Down Expand Up @@ -227,16 +227,17 @@ func checkCgroupCpusetInfo(cgMounts map[string]string, quiet bool) cgroupCpusetI
}

// checkCgroupPids reads the pids information from the pids cgroup mount point.
func checkCgroupPids(quiet bool) cgroupPids {
func checkCgroupPids(cgMounts map[string]string, quiet bool) cgroupPids {
cgroup2, err := cgroupv2.Enabled()
if err != nil {
logrus.Errorf("Failed to check cgroups version: %v", err)
return cgroupPids{}
}
if !cgroup2 {
_, err := cgroups.FindCgroupMountpoint("", "pids")
if err != nil {
_, ok := cgMounts["pids"]
if !ok {
if !quiet {
logrus.Warn(err)
logrus.Warn("unable to find pids cgroup in mounts")
}
return cgroupPids{}
}
Expand Down