www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Add updatelbstatus to allow to have all the LB logic in the balancers.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@936828 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Frederic Clere
2010-04-22 13:13:40 +00:00
parent 66e7158c3d
commit 4c4b534813
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/proxy/mod_proxy.h
View File

@@ -383,6 +383,7 @@ struct proxy_balancer_method {
void *context; /* general purpose storage */ void *context; /* general purpose storage */
apr_status_t (*reset)(proxy_balancer *balancer, server_rec *s); apr_status_t (*reset)(proxy_balancer *balancer, server_rec *s);
apr_status_t (*age)(proxy_balancer *balancer, server_rec *s); apr_status_t (*age)(proxy_balancer *balancer, server_rec *s);
apr_status_t (*updatelbstatus)(proxy_balancer *balancer, proxy_worker *elected, server_rec *s);
}; };
#if APR_HAS_THREADS #if APR_HAS_THREADS

9
modules/proxy/mod_proxy_balancer.c
View File

@@ -471,6 +471,11 @@ static int proxy_balancer_pre_request(proxy_worker **worker,
/* Step 4: find the session route */ /* Step 4: find the session route */
runtime = find_session_route(*balancer, r, &route, &sticky, url); runtime = find_session_route(*balancer, r, &route, &sticky, url);
if (runtime) { if (runtime) {
if ((*balancer)->lbmethod && (*balancer)->lbmethod->updatelbstatus) {
/* Call the LB implementation */
(*balancer)->lbmethod->updatelbstatus(*balancer, runtime, r->server);
}
else { /* Use the default one */
int i, total_factor = 0; int i, total_factor = 0;
proxy_worker **workers; proxy_worker **workers;
/* We have a sticky load balancer /* We have a sticky load balancer
@@ -482,9 +487,6 @@ static int proxy_balancer_pre_request(proxy_worker **worker,
for (i = 0; i < (*balancer)->workers->nelts; i++) { for (i = 0; i < (*balancer)->workers->nelts; i++) {
/* Take into calculation only the workers that are /* Take into calculation only the workers that are
* not in error state or not disabled. * not in error state or not disabled.
*
* TODO: Abstract the below, since this is dependent
* on the LB implementation
*/ */
if (PROXY_WORKER_IS_USABLE(*workers)) { if (PROXY_WORKER_IS_USABLE(*workers)) {
(*workers)->s->lbstatus += (*workers)->s->lbfactor; (*workers)->s->lbstatus += (*workers)->s->lbfactor;
@@ -493,6 +495,7 @@ static int proxy_balancer_pre_request(proxy_worker **worker,
workers++; workers++;
} }
runtime->s->lbstatus -= total_factor; runtime->s->lbstatus -= total_factor;
}
runtime->s->elected++; runtime->s->elected++;
*worker = runtime; *worker = runtime;