diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-07-05 14:10:13 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-06 15:29:38 +0000 |
| commit | eae800789631baa7d377568b2019abd8359cbf70 (patch) | |
| tree | 871496913e9d248a4b57bea39c42a154013de416 /libpod/container.go | |
| parent | 99959e55fa8e902302a580b13d53bc52d0074ad7 (diff) | |
| download | podman-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/container.go')
| -rw-r--r-- | libpod/container.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libpod/container.go b/libpod/container.go index 3708ee287..24a5f93af 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -162,9 +162,6 @@ type containerState struct { // the path of the file on disk outside the container BindMounts map[string]string `json:"bindMounts,omitempty"` - // CgroupCreated indicates that the container has created a cgroup - CgroupCreated bool `json:"cgroupCreated,omitempty"` - // UserNSRoot is the directory used as root for the container when using // user namespaces. UserNSRoot string `json:"userNSRoot,omitempty"` @@ -871,7 +868,7 @@ func (c *Container) NamespacePath(ns LinuxNS) (string, error) { func (c *Container) CGroupPath() (string, error) { switch c.runtime.config.CgroupManager { case CgroupfsCgroupsManager: - return filepath.Join(c.config.CgroupParent, fmt.Sprintf("libpod-%s", c.ID()), "ctr"), nil + return filepath.Join(c.config.CgroupParent, fmt.Sprintf("libpod-%s", c.ID())), nil case SystemdCgroupsManager: return filepath.Join(c.config.CgroupParent, createUnitName("libpod", c.ID())), nil default: |