OSDir


[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: svn commit: r1832609 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/howto/ docs/manual/mod/ modules/proxy/ modules/proxy/balancers/


On Thu, May 31, 2018 at 8:24 AM, <jim@xxxxxxxxxx> wrote:
Author: jim
Date: Thu May 31 13:24:04 2018
New Revision: 1832609

URL: http://svn.apache.org/viewvc?rev=1832609&view=rev
Log:
Merge r1828890, r1832500 from trunk:
[...] 
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_byrequests.c?rev=1832609&r1=1832608&r2=1832609&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_byrequests.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_byrequests.c Thu May 31 13:24:04 2018
[...] 
@@ -70,82 +77,17 @@ static int (*ap_proxy_retry_worker_fn)(c
  *   b a d c d a c d b d ...
  *
  */
-
 static proxy_worker *find_best_byrequests(proxy_balancer *balancer,
                                 request_rec *r)
 {
-    int i;
     int total_factor = 0;
[...] 
+    proxy_worker *worker = ap_proxy_balancer_get_best_worker(balancer, r, is_best_byrequests, &total_factor);

This introduced a new hard runtime config ordering problem on mod_lbmethod_byrequest.so, which must now be loaded AFTER mod_proxy.so.

This was not previously true, as illustrated by mod_lbmethod_heartbeat, using the ap_proxy_retry_worker using an optional function.

lbmethod sorts before proxy, fwiw.