mirror of
https://github.com/Dasharo/systemd.git
synced 2026-03-06 15:02:31 -08:00
core: Don't GC unit if it is in cgroup_empty_queue
The gc_unit_queue is dispatched before the cgroup_empty_queue. Because of this, when we enter in on_cgroup_empty_event, the unit in cgroup_empty_queue may already have been freed and we don't clean up the corresponding cgroup. With this change, we prevent the unit from being garbage collected if it is in the cgroup_empty_queue.
This commit is contained in:
@@ -441,6 +441,9 @@ bool unit_may_gc(Unit *u) {
|
||||
if (u->perpetual)
|
||||
return false;
|
||||
|
||||
if (u->in_cgroup_empty_queue)
|
||||
return false;
|
||||
|
||||
if (sd_bus_track_count(u->bus_track) > 0)
|
||||
return false;
|
||||
|
||||
|
||||
49
test/units/testsuite-19.cleanup-slice.sh
Executable file
49
test/units/testsuite-19.cleanup-slice.sh
Executable file
@@ -0,0 +1,49 @@
|
||||
#!/usr/bin/env bash
|
||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
set -eux
|
||||
set -o pipefail
|
||||
|
||||
# shellcheck source=test/units/util.sh
|
||||
. "$(dirname "$0")"/util.sh
|
||||
|
||||
export SYSTEMD_LOG_LEVEL=debug
|
||||
|
||||
# Create service with KillMode=none inside a slice
|
||||
cat <<EOF >/run/systemd/system/test19cleanup.service
|
||||
[Unit]
|
||||
Description=Test 19 cleanup Service
|
||||
[Service]
|
||||
Slice=test19cleanup.slice
|
||||
Type=exec
|
||||
ExecStart=sleep infinity
|
||||
KillMode=none
|
||||
EOF
|
||||
cat <<EOF >/run/systemd/system/test19cleanup.slice
|
||||
[Unit]
|
||||
Description=Test 19 cleanup Slice
|
||||
EOF
|
||||
|
||||
# Start service
|
||||
systemctl start test19cleanup.service
|
||||
assert_rc 0 systemd-cgls /test19cleanup.slice
|
||||
|
||||
pid=$(systemctl show --property MainPID --value test19cleanup)
|
||||
ps "$pid"
|
||||
|
||||
# Stop slice
|
||||
# The sleep process will not be killed because of KillMode=none
|
||||
# Since there is still a process running under it, the /test19cleanup.slice cgroup won't be removed
|
||||
systemctl stop test19cleanup.slice
|
||||
|
||||
ps "$pid"
|
||||
|
||||
# Kill sleep process manually
|
||||
kill -s TERM "$pid"
|
||||
while kill -0 "$pid" 2>/dev/null; do sleep 0.1; done
|
||||
|
||||
timeout 30 bash -c 'while systemd-cgls /test19cleanup.slice/test19cleanup.service >& /dev/null; do sleep .5; done'
|
||||
assert_rc 1 systemd-cgls /test19cleanup.slice/test19cleanup.service
|
||||
|
||||
# Check that empty cgroup /test19cleanup.slice has been removed
|
||||
timeout 30 bash -c 'while systemd-cgls /test19cleanup.slice >& /dev/null; do sleep .5; done'
|
||||
assert_rc 1 systemd-cgls /test19cleanup.slice
|
||||
Reference in New Issue
Block a user