The lbstatus needs to be updated for every worker, not just the candidate.

Submitted by: mturk

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

diff --git a/modules/proxy/proxy_balancer.c b/modules/proxy/proxy_balancer.c
index b83da582c5cdea18e41c2225903f4596a98bec5f..4a5b7dd2d9e31cea99dff8bca1437d4c5fd2b5b7 100644 (file)
--- a/modules/proxy/proxy_balancer.c
+++ b/modules/proxy/proxy_balancer.c
@@ -134,7 +134,7 @@ static proxy_runtime_worker *find_best_worker(proxy_balancer *balancer,
                                               request_rec *r)
 {
     int i;
-    double total_status = 0.0;
+    double total_factor = 0.0;
     proxy_runtime_worker *worker = (proxy_runtime_worker *)balancer->workers->elts;
     proxy_runtime_worker *candidate = NULL;
 
@@ -153,7 +153,11 @@ static proxy_runtime_worker *find_best_worker(proxy_balancer *balancer,
                 if (worker->w->cp->nfree > candidate->w->cp->nfree)
                     candidate = worker;
             }
-            total_status += worker->lbstatus;
+            /* Total factor should allways be 100.
+             * This is for cases when worker is in error state.
+             * It will force the even request distribution
+             */
+            total_factor += worker->lbfactor;
         }
         worker++;
     }
@@ -204,12 +208,20 @@ static proxy_runtime_worker *find_best_worker(proxy_balancer *balancer,
             }
             worker++;
         }
-        /* XXX: The lbfactor can be update using bytes transfered
-         * Right now, use the round-robin scheme
-         */
-        candidate->lbstatus += candidate->lbfactor;
-        if (candidate->lbstatus >= total_status)
-            candidate->lbstatus = candidate->lbfactor;
+        for (i = 0; i < balancer->workers->nelts; i++) {
+            /* If the worker is not error state
+             * or not in disabled mode
+             */
+            if (worker->w->status > 2) {
+                /* XXX: The lbfactor can be update using bytes transfered
+                 * Right now, use the round-robin scheme
+                 */
+                worker->lbstatus += worker->lbfactor;
+                if (worker->lbstatus >= total_factor)
+                    worker->lbstatus = worker->lbfactor;
+            }
+            worker++;
+        }
     }
     return candidate;
 }