From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 4 May 2020 14:21:23 +0000 (+0300)
Subject: master: Make sure a listener isn't added to a throttled service
X-Git-Tag: 2.3.13~350
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db253d7e8e8f923cc43cc2ed0f18e6ea62b217a5;p=thirdparty%2Fdovecot%2Fcore.git

master: Make sure a listener isn't added to a throttled service

This fixes master process using 100% CPU in some situations when a service
is being throttled.
---

diff --git a/src/master/service-monitor.c b/src/master/service-monitor.c
index b2408b5647..8e1b78fa05 100644
--- a/src/master/service-monitor.c
+++ b/src/master/service-monitor.c
@@ -389,7 +389,7 @@ static void service_monitor_listen_start_force(struct service *service)
 
 void service_monitor_listen_start(struct service *service)
 {
-	if (service->process_avail > 0 ||
+	if (service->process_avail > 0 || service->to_throttle != NULL ||
 	    (service->process_count == service->process_limit &&
 	     service->listen_pending))
 		return;