Commit 3bf35c92 authored by Greg Ames's avatar Greg Ames
Browse files

don't count workers in processes which aren't actively serving requests. 

it is necessary to check for the generation as well as "quiescing", in the
case of a restart where no workers have seen the PoD yet.


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

CHANGES

+6 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.23-dev



  *) More stall fixes for the threaded & worker mpm's.

     Make mod_status output more accurate.  Don't

     count workers in processes which aren't actively

     serving requests. [Greg Ames]

     

  *) Win32: Get SSI exec cgi tag working. [Bill Stoddard]



  *) Add a single listener/multiple worker MPM.  This MPM is

modules/generators/mod_status.c

+3 −1
Original line number Diff line number Diff line
@@ -321,7 +321,9 @@ static int status_handler(request_rec *r) 
	    ps_record = ap_scoreboard_image->parent[i];

	    res = ws_record.status;

	    stat_buffer[indx] = status_flags[res];

            if (!ps_record.quiescing && ps_record.pid) {

            if (!ps_record.quiescing && 

                    ps_record.generation == ap_my_generation &&

                    ps_record.pid) {

	        if (res == SERVER_READY)

	            ready++;

	        else if (res != SERVER_DEAD && res != SERVER_IDLE_KILL)

server/mpm/threaded/threaded.c

+1 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,7 @@ static void perform_idle_server_maintenance(void) 
	     */

	    if (status <= SERVER_READY && status != SERVER_DEAD &&

                    !ps->quiescing &&

                    ps->generation == ap_my_generation &&

                 /* XXX the following shouldn't be necessary if we clean up 

                  *     properly after seg faults, but we're not yet    GLA 

                  */

server/mpm/worker/worker.c

+1 −0
Original line number Diff line number Diff line
@@ -1058,6 +1058,7 @@ static void perform_idle_server_maintenance(void) 
	     */

	    if (status <= SERVER_READY && status != SERVER_DEAD &&

                    !ps->quiescing &&

                    ps->generation == ap_my_generation &&

                 /* XXX the following shouldn't be necessary if we clean up 

                  *     properly after seg faults, but we're not yet    GLA 

                  */