httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r486659 - in /httpd/httpd/branches/2.2.x: STATUS modules/proxy/mod_proxy_balancer.c
Date Wed, 13 Dec 2006 14:06:44 GMT
Author: jim
Date: Wed Dec 13 06:06:43 2006
New Revision: 486659

URL: http://svn.apache.org/viewvc?view=rev&rev=486659
Log:
Merge r484783 from trunk:

No need for each ind lb method to increment the elected
element. Do so from the main calling func.

Reviewed by: jim

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=486659&r1=486658&r2=486659
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Dec 13 06:06:43 2006
@@ -78,16 +78,6 @@
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_proxy_balancer: Have the find_best_worker() function
-    increment the elected counter, rather than requiring each
-    ind lb method to do it, isolating what each lb method
-    needs to do.
-     Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=484783
-     2.2.x version of patch:
-       Trunk version works.
-     +1: jim, rpluem, trawick
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mpm_winnt: Fix return values from wait_for_many_objects.

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c?view=diff&rev=486659&r1=486658&r2=486659
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c Wed Dec 13 06:06:43 2006
@@ -286,6 +286,9 @@
 
     candidate = (*balancer->lbmethod->finder)(balancer, r);
 
+    if (candidate)
+        candidate->s->elected++;
+
 /*
         PROXY_THREAD_UNLOCK(balancer);
         return NULL;
@@ -938,7 +941,6 @@
 
     if (mycandidate) {
         mycandidate->s->lbstatus -= total_factor;
-        mycandidate->s->elected++;
     }
 
     return mycandidate;
@@ -1016,10 +1018,6 @@
         }
         cur_lbset++;
     } while (cur_lbset <= max_lbset && !mycandidate);
-
-    if (mycandidate) {
-        mycandidate->s->elected++;
-    }
 
     return mycandidate;
 }



Mime
View raw message