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

Merge pull request #5728 from openSUSE/pids.current

Browse Source 
Do not error on pids.current stats if ctr.path is empty
This commit is contained in:
OpenShift Merge Robot
2020-04-07 15:56:50 +02:00
committed by GitHub
parent c0e29b4a31 7864afd6b2
commit 44f910c28c
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 {