opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 18:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not error on pids.current stats if ctr.path is empty

Browse Source 
If the ctr.path is empty, then we do not try to access
`/sys/fs/cgroup/pids/pids.current` any more because this path will be
wrong in any case. We now return and do not set the PIDs stats.

Refers to https://github.com/cri-o/cri-o/issues/3522

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
This commit is contained in:
Sascha Grunert
2020-04-06 13:04:52 +02:00
parent f7dffedeb6
commit 7864afd6b2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cgroups/pids.go
View File

@ -44,8 +44,12 @@ func (c *pidHandler) Destroy(ctr *CgroupControl) error {
// Stat fills a metrics structure with usage stats for the controller // Stat fills a metrics structure with usage stats for the controller
func (c *pidHandler) Stat(ctr *CgroupControl, m *Metrics) error { func (c *pidHandler) Stat(ctr *CgroupControl, m *Metrics) error {
var PIDRoot string if ctr.path != "" {
// nothing we can do to retrieve the pids.current path
return nil
}
var PIDRoot string
if ctr.cgroup2 { if ctr.cgroup2 {
PIDRoot = filepath.Join(cgroupRoot, ctr.path) PIDRoot = filepath.Join(cgroupRoot, ctr.path)
} else { } else {