diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-05 07:35:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-05 07:35:29 -0800 |
| commit | 4fb724c72e49768ed31d2dc85a7ad579f8d5c872 (patch) | |
| tree | 86bfbf8435a9eb5fd523363957809a6902b83af1 /libpod | |
| parent | ae839dad5add84b5b6ffd4260987d08441196986 (diff) | |
| parent | 077ee1a10dafcebe8149f674eee10748a2114336 (diff) | |
| download | podman-4fb724c72e49768ed31d2dc85a7ad579f8d5c872.tar.gz podman-4fb724c72e49768ed31d2dc85a7ad579f8d5c872.tar.bz2 podman-4fb724c72e49768ed31d2dc85a7ad579f8d5c872.zip | |
Merge pull request #4639 from giuseppe/fix-stats-pod
libpod: fix stats for rootless pods
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libpod/container.go b/libpod/container.go index d978e4e38..dcec3ee50 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -6,6 +6,7 @@ import ( "net" "os" "path/filepath" + "strings" "time" "github.com/containernetworking/cni/pkg/types" @@ -1072,7 +1073,14 @@ func (c *Container) CGroupPath() (string, error) { case define.SystemdCgroupsManager: if rootless.IsRootless() { uid := rootless.GetRootlessUID() - return filepath.Join(c.config.CgroupParent, fmt.Sprintf("user-%d.slice/user@%d.service/user.slice", uid, uid), createUnitName("libpod", c.ID())), nil + parts := strings.SplitN(c.config.CgroupParent, "/", 2) + + dir := "" + if len(parts) > 1 { + dir = parts[1] + } + + return filepath.Join(parts[0], fmt.Sprintf("user-%d.slice/user@%d.service/user.slice/%s", uid, uid, dir), createUnitName("libpod", c.ID())), nil } return filepath.Join(c.config.CgroupParent, createUnitName("libpod", c.ID())), nil default: |