summaryrefslogtreecommitdiff
path: root/libpod/oci_linux.go
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-07-05 14:10:13 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-07-06 15:29:38 +0000
commiteae800789631baa7d377568b2019abd8359cbf70 (patch)
tree871496913e9d248a4b57bea39c42a154013de416 /libpod/oci_linux.go
parent99959e55fa8e902302a580b13d53bc52d0074ad7 (diff)
downloadpodman-eae800789631baa7d377568b2019abd8359cbf70.tar.gz
podman-eae800789631baa7d377568b2019abd8359cbf70.tar.bz2
podman-eae800789631baa7d377568b2019abd8359cbf70.zip
Remove per-container CGroup parents
Originally, it seemed like a good idea to place Conmon and the container it managed under a shared CGroup, so we could manage the two together. It's become increasingly clear that this is a potential performance sore point, gains us little practical benefit in managing Conmon, and adds extra steps to container cleanup that interfere with Conmon postrun hooks. Revert back to a shared CGroup for conmon processes under the CGroup parent. This will retain per-pod conmon CGroups as well if the pod is set to create a CGroup and act as CGroup parent for its containers. Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #1051 Approved by: umohnani8
Diffstat (limited to 'libpod/oci_linux.go')
-rw-r--r--libpod/oci_linux.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci_linux.go b/libpod/oci_linux.go
index 2128b7481..2be7ee07c 100644
--- a/libpod/oci_linux.go
+++ b/libpod/oci_linux.go
@@ -28,7 +28,7 @@ func (r *OCIRuntime) moveConmonToCgroup(ctr *Container, cgroupParent string, cmd
logrus.Warnf("Failed to add conmon to systemd sandbox cgroup: %v", err)
}
} else {
- cgroupPath := filepath.Join(ctr.config.CgroupParent, fmt.Sprintf("libpod-%s", ctr.ID()), "conmon")
+ cgroupPath := filepath.Join(ctr.config.CgroupParent, "conmon")
control, err := cgroups.New(cgroups.V1, cgroups.StaticPath(cgroupPath), &spec.LinuxResources{})
if err != nil {
logrus.Warnf("Failed to add conmon to cgroupfs sandbox cgroup: %v", err)