Skip to content

Commit ae83e97

Browse files
msekletarkeszybz
authored andcommitted
core/service: when resetting PID also reset known flag
Re-watching pids on cgroup v1 (needed because of unreliability of cgroup empty notifications in containers) is handled bellow at the end of service_sigchld_event() and depends on value main_pid_known flag. In CentOS Stream 8 container on cgroup v1 the stop action would get stuck indefinitely on unit like this, $ cat /run/systemd/system/foo.service [Service] ExecStart=/bin/bash -c 'trap "nohup sleep 1 & exit 0" TERM; sleep infinity' ExecStop=/bin/bash -c 'kill -s TERM $MAINPID' TimeoutSec=0 However, upstream works "fine" because in upstream version of systemd we actually never wait on processes killed in containers and proceed immediately to sending SIGKILL hence re-watching of pids in the cgroup is not necessary. But for the sake of correctness we should merge the patch also upstream. (cherry picked from commit ff32060)
1 parent f0bb967 commit ae83e97

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

‎src/core/service.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3592,6 +3592,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
35923592
return;
35933593

35943594
s->main_pid = 0;
3595+
s->main_pid_known = false;
35953596
exec_status_exit(&s->main_exec_status, &s->exec_context, pid, code, status);
35963597

35973598
if (s->main_command) {

0 commit comments

Comments
 (0)