OSSInnovation
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cgroup, systemd: cleanup cgroups 

some hierarchies were created directly by .Apply() on top of systemd
managed cgroups.  systemd doesn't manage these and as a result we leak
these cgroups.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2020-07-05 12:37:32 +02:00
parent 2deaeab08f
commit 32034481ea
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcontainer/cgroups/systemd/v1.go
View File

@ -222,7 +222,14 @@ func (m *legacyManager) Destroy() error {
return err
}
unitName := getUnitName(m.cgroups)
if err := stopUnit(dbusConnection, unitName); err != nil {
err = stopUnit(dbusConnection, unitName)
// Both on success and on error, cleanup all the cgroups we are aware of.
// Some of them were created directly by Apply() and are not managed by systemd.
if err := cgroups.RemovePaths(m.paths); err != nil {
return err
}
if err != nil {
return err
}
m.paths = make(map[string]string)

20
tests/integration/delete.bats
View File

@ -12,24 +12,24 @@ function teardown() {
}
@test "runc delete" {
# run busybox detached
runc run -d --console-socket $CONSOLE_SOCKET test_busybox
runc run -d --console-socket $CONSOLE_SOCKET testbusyboxdelete
[ "$status" -eq 0 ]
# check state
testcontainer test_busybox running
testcontainer testbusyboxdelete running
runc kill test_busybox KILL
runc kill testbusyboxdelete KILL
[ "$status" -eq 0 ]
# wait for busybox to be in the destroyed state
retry 10 1 eval "__runc state test_busybox | grep -q 'stopped'"
retry 10 1 eval "__runc state testbusyboxdelete | grep -q 'stopped'"
# delete test_busybox
runc delete test_busybox
runc delete testbusyboxdelete
[ "$status" -eq 0 ]
runc state test_busybox
runc state testbusyboxdelete
[ "$status" -ne 0 ]
run find /sys/fs/cgroup -wholename '*testbusyboxdelete*' -type d
[ "$status" -eq 0 ]
[ "$output" = "" ] || fail "cgroup not cleaned up correctly: $output"
}
@test "runc delete --force" {