From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 31 May 2024 20:19:53 +0000 (+0300)
Subject: master: Fix assert-crash after "Process .. is ignoring idle SIGINT" error
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=826a3b66e9cc2ad3e847f0edaff7f20018201b38;p=thirdparty%2Fdovecot%2Fcore.git

master: Fix assert-crash after "Process .. is ignoring idle SIGINT" error

The timeout was called multiple times, which caused internal state to break.

Fixes:
Panic: file service-monitor.c: line 60 (service_kill_idle): assertion failed: (processes_to_kill <= service->process_avail)
---

diff --git a/src/master/service-monitor.c b/src/master/service-monitor.c
index 0a65733a87..72fbc63164 100644
--- a/src/master/service-monitor.c
+++ b/src/master/service-monitor.c
@@ -41,6 +41,8 @@ static void service_process_idle_kill_timeout(struct service_process *process)
 	service_error(process->service, "Process %s is ignoring idle SIGINT",
 		      dec2str(process->pid));
 
+	timeout_remove(&process->to_idle_kill);
+
 	/* assume this process is busy */
 	i_zero(&status);
 	service_status_more(process, &status);