From faf97b1dba15410e2013c55fd68019dee820ad0c Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 28 Jun 2016 11:46:34 +0000 Subject: [PATCH] Merge r1750218 from trunk: Follow up to r1737447: fix max_spare_threads lower bound. Suggested by: Rick Houser Submitted by: ylavic Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1750488 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 5 ----- server/mpm/event/event.c | 10 ++++++++-- server/mpm/worker/worker.c | 10 ++++++++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/STATUS b/STATUS index 0aed659f72..1afcbbeeaf 100644 --- a/STATUS +++ b/STATUS @@ -116,11 +116,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mpm_event/worker: fix MaxSpareThreads lower bound (follow up to / - consistent with MinSpareThreads' change in r1748336 from 2.4.21) - trunk patch: http://svn.apache.org/r1750218 - 2.4.x: trunk works - +1: ylavic, rpluem, jim PATCHES PROPOSED TO BACKPORT FROM TRUNK: diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index 89ee47671d..baeb5a76eb 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -2829,10 +2829,16 @@ static int event_run(apr_pool_t * _pconf, apr_pool_t * plog, server_rec * s) ap_daemons_limit = num_buckets; if (ap_daemons_to_start < num_buckets) ap_daemons_to_start = num_buckets; + /* We want to create as much children at a time as the number of buckets, + * so to optimally accept connections (evenly distributed accross buckets). + * Thus min_spare_threads should at least maintain num_buckets children, + * and max_spare_threads allow num_buckets more children w/o triggering + * immediately (e.g. num_buckets idle threads margin, one per bucket). + */ if (min_spare_threads < threads_per_child * (num_buckets - 1) + num_buckets) min_spare_threads = threads_per_child * (num_buckets - 1) + num_buckets; - if (max_spare_threads < min_spare_threads + threads_per_child * num_buckets) - max_spare_threads = min_spare_threads + threads_per_child * num_buckets; + if (max_spare_threads < min_spare_threads + (threads_per_child + 1) * num_buckets) + max_spare_threads = min_spare_threads + (threads_per_child + 1) * num_buckets; /* If we're doing a graceful_restart then we're going to see a lot * of children exiting immediately when we get into the main loop diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index d15ffa207c..d0ed604063 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -1836,10 +1836,16 @@ static int worker_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_daemons_limit = num_buckets; if (ap_daemons_to_start < num_buckets) ap_daemons_to_start = num_buckets; + /* We want to create as much children at a time as the number of buckets, + * so to optimally accept connections (evenly distributed accross buckets). + * Thus min_spare_threads should at least maintain num_buckets children, + * and max_spare_threads allow num_buckets more children w/o triggering + * immediately (e.g. num_buckets idle threads margin, one per bucket). + */ if (min_spare_threads < threads_per_child * (num_buckets - 1) + num_buckets) min_spare_threads = threads_per_child * (num_buckets - 1) + num_buckets; - if (max_spare_threads < min_spare_threads + threads_per_child * num_buckets) - max_spare_threads = min_spare_threads + threads_per_child * num_buckets; + if (max_spare_threads < min_spare_threads + (threads_per_child + 1) * num_buckets) + max_spare_threads = min_spare_threads + (threads_per_child + 1) * num_buckets; /* If we're doing a graceful_restart then we're going to see a lot * of children exiting immediately when we get into the main loop -- 2.40.0