diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-09-10 10:06:45 +0200 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-09-16 09:42:14 -0400 |
| commit | fd8d332a4e440462f2dc8fbd1de4c291187fd92a (patch) | |
| tree | 47971e6fb614acffa8da139aeceef59f4aa73378 /libpod | |
| parent | 33591c3ef4657f2f0512e018f916f13e5612d364 (diff) | |
| download | podman-fd8d332a4e440462f2dc8fbd1de4c291187fd92a.tar.gz podman-fd8d332a4e440462f2dc8fbd1de4c291187fd92a.tar.bz2 podman-fd8d332a4e440462f2dc8fbd1de4c291187fd92a.zip | |
test: enable --cgroup-parent test
and fix it for running with runc.
Closes: https://github.com/containers/podman/issues/11165
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_internal_linux.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index eabe8efd2..ae029dc62 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -2489,11 +2489,6 @@ func (c *Container) getOCICgroupPath() (string, error) { switch { case c.config.NoCgroups: return "", nil - case (rootless.IsRootless() && (cgroupManager == config.CgroupfsCgroupsManager || !unified)): - if !isRootlessCgroupSet(c.config.CgroupParent) { - return "", nil - } - return c.config.CgroupParent, nil case c.config.CgroupsMode == cgroupSplit: if c.config.CgroupParent != "" { return c.config.CgroupParent, nil @@ -2510,6 +2505,11 @@ func (c *Container) getOCICgroupPath() (string, error) { systemdCgroups := fmt.Sprintf("%s:libpod:%s", path.Base(c.config.CgroupParent), c.ID()) logrus.Debugf("Setting CGroups for container %s to %s", c.ID(), systemdCgroups) return systemdCgroups, nil + case (rootless.IsRootless() && (cgroupManager == config.CgroupfsCgroupsManager || !unified)): + if c.config.CgroupParent == "" || !isRootlessCgroupSet(c.config.CgroupParent) { + return "", nil + } + fallthrough case cgroupManager == config.CgroupfsCgroupsManager: cgroupPath := filepath.Join(c.config.CgroupParent, fmt.Sprintf("libpod-%s", c.ID())) logrus.Debugf("Setting CGroup path for container %s to %s", c.ID(), cgroupPath) |