github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-05 03:26:37 +00:00
Code Issues Projects Releases Wiki Activity

cgroups: fix failed to remove sandbox cgroup

Browse Source 
sandbox cgroup use V1NoConstraints, this only create memory subsystem,
but when delete, load parent cgroup always use `cgroups.V1`, so other
subsystem path can not be find, sandbox cgroup can not be deleted.

Fixes: #1263

Signed-off-by: Ace-Tang <aceapril@126.com>
This commit is contained in:
Ace-Tang 2019-02-21 17:17:11 +08:00
parent 1d79338a1a
commit 454775fb97
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virtcontainers/cgroups.go
View File

@ -125,11 +125,11 @@ func cgroupNoConstraintsPath(path string) string {
} }
// return the parent cgroup for the given path // return the parent cgroup for the given path
func parentCgroup(path string) (cgroups.Cgroup, error) { func parentCgroup(hierarchy cgroups.Hierarchy, path string) (cgroups.Cgroup, error) {
// append '/' just in case CgroupsPath doesn't start with it // append '/' just in case CgroupsPath doesn't start with it
parent := filepath.Dir("/" + path) parent := filepath.Dir("/" + path)
parentCgroup, err := cgroupsLoadFunc(cgroups.V1, parentCgroup, err := cgroupsLoadFunc(hierarchy,
cgroups.StaticPath(parent)) cgroups.StaticPath(parent))
if err != nil { if err != nil {
return nil, fmt.Errorf("Could not load parent cgroup %v: %v", parent, err) return nil, fmt.Errorf("Could not load parent cgroup %v: %v", parent, err)
@ -186,7 +186,7 @@ func (s *Sandbox) deleteCgroups() error {
} }
// move running process here, that way cgroup can be removed // move running process here, that way cgroup can be removed
parent, err := parentCgroup(path) parent, err := parentCgroup(V1NoConstraints, path)
if err != nil { if err != nil {
// parent cgroup doesn't exist, that means there are no process running // parent cgroup doesn't exist, that means there are no process running
// and the no constraints cgroup was removed. // and the no constraints cgroup was removed.

2
virtcontainers/container.go
View File

@ -1315,7 +1315,7 @@ func (c *Container) deleteCgroups() error {
} }
// move running process here, that way cgroup can be removed // move running process here, that way cgroup can be removed
parent, err := parentCgroup(c.state.CgroupPath) parent, err := parentCgroup(cgroups.V1, c.state.CgroupPath)
if err != nil { if err != nil {
// parent cgroup doesn't exist, that means there are no process running // parent cgroup doesn't exist, that means there are no process running
// and the container cgroup was removed. // and the container cgroup was removed.