diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-04-12 16:52:42 +0200 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-04-16 11:39:20 -0400 |
| commit | 386300443b4b7acecba25809e4af3129d640aee5 (patch) | |
| tree | 566385fdbd369f43ff50f4393d37003e0c1907c1 | |
| parent | 0e28e3da3fb80ae77f3c7a4ba09da0b467914339 (diff) | |
| download | podman-386300443b4b7acecba25809e4af3129d640aee5.tar.gz podman-386300443b4b7acecba25809e4af3129d640aee5.tar.bz2 podman-386300443b4b7acecba25809e4af3129d640aee5.zip | |
cgroup: do not set cgroup parent when rootless and cgroupfs
do not set the cgroup parent when running as rootless with cgroupfs,
even if cgroup v2 is used.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1947999
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | libpod/container_internal_linux.go | 2 | ||||
| -rw-r--r-- | test/system/420-cgroups.bats | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index a136fb72d..0669f4db5 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -2214,7 +2214,7 @@ func (c *Container) getOCICgroupPath() (string, error) { } cgroupManager := c.CgroupManager() switch { - case (rootless.IsRootless() && !unified) || c.config.NoCgroups: + case (rootless.IsRootless() && (cgroupManager == config.CgroupfsCgroupsManager || !unified)) || c.config.NoCgroups: return "", nil case c.config.CgroupsMode == cgroupSplit: if c.config.CgroupParent != "" { diff --git a/test/system/420-cgroups.bats b/test/system/420-cgroups.bats index 615e43e6c..89c81a742 100644 --- a/test/system/420-cgroups.bats +++ b/test/system/420-cgroups.bats @@ -24,6 +24,11 @@ load helpers run_podman container inspect --format '{{.HostConfig.CgroupManager}}' myc is "$output" "$other" "podman preserved .HostConfig.CgroupManager" + if is_rootless && test $other = cgroupfs ; then + run_podman container inspect --format '{{.HostConfig.CgroupParent}}' myc + is "$output" "" "podman didn't set .HostConfig.CgroupParent for cgroupfs and rootless" + fi + # Restart the container, without --cgroup-manager option (ie use default) # Prior to #7970, this would fail with an OCI runtime error run_podman start myc |