opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 17:16:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: enable --cgroup-parent test

Browse Source 
and fix it for running with runc.

Closes: https://github.com/containers/podman/issues/11165

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2021-09-10 10:06:45 +02:00
parent b603c7a4b9
commit b1768d3b08
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libpod/container_internal_linux.go
View File

@ -2489,11 +2489,6 @@ func (c *Container) getOCICgroupPath() (string, error) {
switch { switch {
case c.config.NoCgroups: case c.config.NoCgroups:
return "", nil 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: case c.config.CgroupsMode == cgroupSplit:
if c.config.CgroupParent != "" { if c.config.CgroupParent != "" {
return c.config.CgroupParent, nil 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()) 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) logrus.Debugf("Setting CGroups for container %s to %s", c.ID(), systemdCgroups)
return systemdCgroups, nil 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: case cgroupManager == config.CgroupfsCgroupsManager:
cgroupPath := filepath.Join(c.config.CgroupParent, fmt.Sprintf("libpod-%s", c.ID())) 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) logrus.Debugf("Setting CGroup path for container %s to %s", c.ID(), cgroupPath)

32
test/e2e/run_cgroup_parent_test.go
View File

@ -13,6 +13,8 @@ import (
. "github.com/onsi/gomega/gexec" . "github.com/onsi/gomega/gexec"
) )
const cgroupRoot = "/sys/fs/cgroup"
var _ = Describe("Podman run with --cgroup-parent", func() { var _ = Describe("Podman run with --cgroup-parent", func() {
var ( var (
tempdir string tempdir string
@ -64,7 +66,6 @@ var _ = Describe("Podman run with --cgroup-parent", func() {
}) })
Specify("always honor --cgroup-parent", func() { Specify("always honor --cgroup-parent", func() {
Skip("https://github.com/containers/podman/issues/11165")
SkipIfCgroupV1("test not supported in cgroups v1") SkipIfCgroupV1("test not supported in cgroups v1")
if Containerized() || podmanTest.CgroupManager == "cgroupfs" { if Containerized() || podmanTest.CgroupManager == "cgroupfs" {
Skip("Requires Systemd cgroup manager support") Skip("Requires Systemd cgroup manager support")
@ -78,36 +79,31 @@ var _ = Describe("Podman run with --cgroup-parent", func() {
Expect(run).Should(Exit(0)) Expect(run).Should(Exit(0))
cid := run.OutputToString() cid := run.OutputToString()
exec := podmanTest.Podman([]string{"exec", cid, "cat", "/proc/self/cgroup"}) exec := podmanTest.Podman([]string{"exec", cid, "cat", "/proc/1/cgroup"})
exec.WaitWithDefaultTimeout() exec.WaitWithDefaultTimeout()
Expect(exec).Should(Exit(0)) Expect(exec).Should(Exit(0))
containerCgroup := strings.TrimRight(strings.Replace(exec.OutputToString(), "0::", "", -1), "\n") containerCgroup := strings.TrimRight(strings.Replace(exec.OutputToString(), "0::", "", -1), "\n")
content, err := ioutil.ReadFile(filepath.Join("/sys/fs/cgroup", containerCgroup, "cgroup.procs"))
Expect(err).To(BeNil())
// Move the container process to a sub cgroup // Move the container process to a sub cgroup
subCgroupPath := filepath.Join(filepath.Join("/sys/fs/cgroup", containerCgroup, "old-container")) content, err := ioutil.ReadFile(filepath.Join(cgroupRoot, containerCgroup, "cgroup.procs"))
Expect(err).To(BeNil())
err = os.MkdirAll(subCgroupPath, 0755) oldSubCgroupPath := filepath.Join(filepath.Join(cgroupRoot, containerCgroup, "old-container"))
err = os.MkdirAll(oldSubCgroupPath, 0755)
Expect(err).To(BeNil())
err = ioutil.WriteFile(filepath.Join(oldSubCgroupPath, "cgroup.procs"), content, 0644)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
err = ioutil.WriteFile(filepath.Join(subCgroupPath, "cgroup.procs"), content, 0644) newCgroup := fmt.Sprintf("%s/new-container", containerCgroup)
err = os.MkdirAll(filepath.Join(cgroupRoot, newCgroup), 0755)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
cgroup := filepath.Dir(containerCgroup) run = podmanTest.Podman([]string{"--cgroup-manager=cgroupfs", "run", "--rm", "--cgroupns=host", fmt.Sprintf("--cgroup-parent=%s", newCgroup), fedoraMinimal, "cat", "/proc/self/cgroup"})
run = podmanTest.Podman([]string{"--cgroup-manager=cgroupfs", "run", "-d", fmt.Sprintf("--cgroup-parent=%s", cgroup), fedoraMinimal, "sleep", "100"})
run.WaitWithDefaultTimeout() run.WaitWithDefaultTimeout()
Expect(run).Should(Exit(0)) Expect(run).Should(Exit(0))
cgroupEffective := strings.TrimRight(strings.Replace(run.OutputToString(), "0::", "", -1), "\n")
exec = podmanTest.Podman([]string{"exec", cid, "cat", "/proc/self/cgroup"}) Expect(newCgroup).To(Equal(filepath.Dir(cgroupEffective)))
exec.WaitWithDefaultTimeout()
Expect(exec).Should(Exit(0))
cgroupEffective := filepath.Dir(strings.TrimRight(strings.Replace(exec.OutputToString(), "0::", "", -1), "\n"))
Expect(cgroupEffective).To(Equal(cgroup))
}) })
Specify("valid --cgroup-parent using slice", func() { Specify("valid --cgroup-parent using slice", func() {