Commit f1a8c3e5 authored by Eric Covener's avatar Eric Covener
Browse files

mpm_event: avoid AH00484 with idle threads 

mpm_event: Stop issuing AH00484 "server reached MaxRequestWorkers..." when
there are still idle threads available. When there are less idle threads than
MinSpareThreads, issue new one-time message AH10159. Matches worker MPM.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1843513 13f79535-47bb-0310-9956-ffa450edef68
parent d28840a6

CHANGES

+5 −0
Changes for CHANGES: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.1



  *) mpm_event: Stop issuing AH00484 "server reached MaxRequestWorkers..." when

     there are still idle threads available. When there are less idle threads than

     MinSpareThreads, issue new one-time message AH10159. Matches worker MPM.

     [Eric Covener]



  *) mod_http2: adding defensive code for stream EOS handling, in case the request handler

     missed to signal it the normal way (eos buckets). Addresses github issues 

     https://github.com/icing/mod_h2/issues/164, https://github.com/icing/mod_h2/issues/167

docs/log-message-tags/next-number

+1 −1
Changes for docs/log-message-tags/next-number: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
10159
 
10160

server/mpm/event/event.c

+12 −1
Changes for server/mpm/event/event.c: 12 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -401,6 +401,7 @@ typedef struct event_retained_data { 
    int first_thread_limit;

    int sick_child_detected;

    int maxclients_reported;

    int near_maxclients_reported;

    /*

     * The max child slot ever assigned, preserved across restarts.  Necessary

     * to deal with MaxRequestWorkers changes across AP_SIG_GRACEFUL restarts.
@@ -3114,14 +3115,24 @@ static void perform_idle_server_maintenance(int child_bucket, int num_buckets) 
    }

    else if (idle_thread_count < min_spare_threads / num_buckets) {

        if (active_thread_count >= max_workers) {

            if (0 == idle_thread_count) { 

                if (!retained->maxclients_reported) {

                /* only report this condition once */

                    ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(00484)

                                 "server reached MaxRequestWorkers setting, "

                                 "consider raising the MaxRequestWorkers "

                                 "setting");

                    retained->maxclients_reported = 1;

                }

             }

             else { 

                if (!retained->near_maxclients_reported) {

                    ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, APLOGNO(10159)

                            "server is within MinSpareThreads of "

                            "MaxRequestWorkers, consider raising the "

                            "MaxRequestWorkers setting");

                    retained->near_maxclients_reported = 1;

                }

            }

            retained->idle_spawn_rate[child_bucket] = 1;

        }

        else if (free_length == 0) { /* scoreboard is full, can't fork */