From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 21 Sep 2017 14:53:04 +0000 (+0300)
Subject: master: Don't throttle services that are already being destroyed
X-Git-Tag: 2.3.0.rc1~969
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59d98f43a1fe99559d58c0f37a49ca7e3be7bb27;p=thirdparty%2Fdovecot%2Fcore.git

master: Don't throttle services that are already being destroyed

If process couldn't be created, because the service_list is already being
destroyed (e.g. due to reload), also don't enable unnecessary throttling
for the service.

Hopefully fixes these random errors that are logged alone:
master: Error: service(...): command startup failed, throttling for 2 secs
---

diff --git a/src/master/service-monitor.c b/src/master/service-monitor.c
index c13d6bf84a..16fa13cf29 100644
--- a/src/master/service-monitor.c
+++ b/src/master/service-monitor.c
@@ -192,7 +192,7 @@ static void service_status_input(struct service *service)
 
 static void service_monitor_throttle(struct service *service)
 {
-	if (service->to_throttle != NULL)
+	if (service->to_throttle != NULL || service->list->destroying)
 		return;
 
 	i_assert(service->throttle_secs > 0);