Author: jfrederic.clere(a)jboss.com
Date: 2008-06-17 09:16:59 -0400 (Tue, 17 Jun 2008)
New Revision: 1706
Modified:
trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
Log:
Remove the lbset logic.
Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-06-17 13:13:35 UTC
(rev 1705)
+++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-06-17 13:16:59 UTC
(rev 1706)
@@ -145,7 +145,6 @@
(*worker)->s->route[PROXY_WORKER_MAX_ROUTE_SIZ] = '\0';
/* XXX: We need that information from TC */
(*worker)->s->redirect[0] = '\0';
- (*worker)->s->lbset = 0;
}
(*worker)->s->lbstatus = 1;
@@ -708,8 +707,6 @@
int total_factor = 0;
proxy_worker *worker;
proxy_worker *mycandidate = NULL;
- int cur_lbset = 0;
- int max_lbset = 0;
int checking_standby;
int checked_standby;
void *sconf = r->server->module_config;
@@ -729,12 +726,6 @@
while (!mycandidate && !checked_standby) {
worker = (proxy_worker *)balancer->workers->elts;
for (i = 0; i < balancer->workers->nelts; i++, worker++) {
- if (!checking_standby) { /* first time through */
- if (worker->s->lbset > max_lbset)
- max_lbset = worker->s->lbset;
- }
- if (worker->s->lbset > cur_lbset)
- continue;
/* standby logic
* lbfactor: -1 broken node.
@@ -768,8 +759,7 @@
}
checked_standby = checking_standby++;
}
- cur_lbset++;
- } while (cur_lbset <= max_lbset && !mycandidate);
+ } while (!mycandidate);
if (mycandidate) {
mycandidate->s->lbstatus -= total_factor;
Show replies by date