Commit 03f0bf83 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

If a child is created just before graceful restart and then exits because 

of a missing lock file, don't shutdown the whole server.

PR: 39311
Submitted by: Shawn Michael <smichael rightnow com>


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

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ Changes with Apache 2.3.15 
     PR 51714. [Stefan Fritsch, Jim Jagielski, Ruediger Pluem, Eric Covener,

     <lowprio20 gmail.com>]



  *) mpm_prefork, mpm_worker, mpm_event: If a child is created just before

     graceful restart and then exits because of a missing lock file, don't

     shutdown the whole server. PR 39311. [Shawn Michael

     <smichael rightnow com>]



  *) mpm_event: Check the return value from ap_run_create_connection.

     PR: 41194. [Davi Arnaut]

server/mpm/event/event.c

+20 −4
Original line number Diff line number Diff line
@@ -2421,11 +2421,28 @@ static void server_main_loop(int remaining_children_to_start) 


        if (pid.pid != -1) {

            processed_status = ap_process_child_status(&pid, exitwhy, status);

            child_slot = ap_find_child_by_pid(&pid);

            if (processed_status == APEXIT_CHILDFATAL) {

                /* fix race condition found in PR 39311

                 * A child created at the same time as a graceful happens 

                 * can find the lock missing and create a fatal error.

                 * It is not fatal for the last generation to be in this state.

                 */

                if (child_slot < 0

                    || ap_get_scoreboard_process(child_slot)->generation

                       == retained->my_generation) {

                    shutdown_pending = 1;

                    child_fatal = 1;

                    return;

                }

                else {

                    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf,

                                 "Ignoring fatal error in child of previous "

                                 "generation (pid %ld).",

                                 (long)pid.pid);

                    retained->sick_child_detected = 1;

                }

            }

            else if (processed_status == APEXIT_CHILDSICK) {

                /* tell perform_idle_server_maintenance to check into this

                 * on the next timer pop
@@ -2433,7 +2450,6 @@ static void server_main_loop(int remaining_children_to_start) 
                retained->sick_child_detected = 1;

            }

            /* non-fatal death... note that it's gone in the scoreboard. */

            child_slot = ap_find_child_by_pid(&pid);

            if (child_slot >= 0) {

                for (i = 0; i < threads_per_child; i++)

                    ap_update_child_status_from_indexes(child_slot, i,

server/mpm/prefork/prefork.c

+18 −3
Original line number Diff line number Diff line
@@ -1004,13 +1004,28 @@ static int prefork_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) 
         */

        if (pid.pid != -1) {

            processed_status = ap_process_child_status(&pid, exitwhy, status);

            child_slot = ap_find_child_by_pid(&pid);

            if (processed_status == APEXIT_CHILDFATAL) {

                /* fix race condition found in PR 39311

                 * A child created at the same time as a graceful happens 

                 * can find the lock missing and create a fatal error.

                 * It is not fatal for the last generation to be in this state.

                 */

                if (child_slot < 0

                    || ap_get_scoreboard_process(child_slot)->generation

                       == retained->my_generation) {

                    mpm_state = AP_MPMQ_STOPPING;

                    return DONE;

                }

                else {

                    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf,

                                 "Ignoring fatal error in child of previous "

                                 "generation (pid %ld).",

                                 (long)pid.pid);

                }

            }



            /* non-fatal death... note that it's gone in the scoreboard. */

            child_slot = ap_find_child_by_pid(&pid);

            if (child_slot >= 0) {

                (void) ap_update_child_status_from_indexes(child_slot, 0, SERVER_DEAD,

                                                           (request_rec *) NULL);

server/mpm/worker/worker.c

+20 −4
Original line number Diff line number Diff line
@@ -1647,11 +1647,28 @@ static void server_main_loop(int remaining_children_to_start) 


        if (pid.pid != -1) {

            processed_status = ap_process_child_status(&pid, exitwhy, status);

            child_slot = ap_find_child_by_pid(&pid);

            if (processed_status == APEXIT_CHILDFATAL) {

                /* fix race condition found in PR 39311

                 * A child created at the same time as a graceful happens 

                 * can find the lock missing and create a fatal error.

                 * It is not fatal for the last generation to be in this state.

                 */

                if (child_slot < 0

                    || ap_get_scoreboard_process(child_slot)->generation

                       == retained->my_generation) {

                    shutdown_pending = 1;

                    child_fatal = 1;

                    return;

                }

                else {

                    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf,

                                 "Ignoring fatal error in child of previous "

                                 "generation (pid %ld).",

                                 (long)pid.pid);

                    retained->sick_child_detected = 1;

                }

            }

            else if (processed_status == APEXIT_CHILDSICK) {

                /* tell perform_idle_server_maintenance to check into this

                 * on the next timer pop
@@ -1659,7 +1676,6 @@ static void server_main_loop(int remaining_children_to_start) 
                retained->sick_child_detected = 1;

            }

            /* non-fatal death... note that it's gone in the scoreboard. */

            child_slot = ap_find_child_by_pid(&pid);

            if (child_slot >= 0) {

                for (i = 0; i < threads_per_child; i++)

                    ap_update_child_status_from_indexes(child_slot, i, SERVER_DEAD,