[prev in list] [next in list] [prev in thread] [next in thread]
List: apache-cvs
Subject: svn commit: r1065750 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.c
From: jim () apache ! org
Date: 2011-01-31 20:29:01
Message-ID: 20110131202901.938962388A66 () eris ! apache ! org
[Download RAW message or body]
Author: jim
Date: Mon Jan 31 20:29:01 2011
New Revision: 1065750
URL: http://svn.apache.org/viewvc?rev=1065750&view=rev
Log:
Move the lbmethod to also allow it to be adjusted runtime
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.c
httpd/httpd/trunk/modules/proxy/mod_proxy.h
httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1065750&r1=1065749&r2=1065750&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Mon Jan 31 20:29:01 2011
@@ -363,7 +363,7 @@ static const char *set_balancer_param(pr
proxy_balancer_method *provider;
provider = ap_lookup_provider(PROXY_LBMETHOD, val, "0");
if (provider) {
- balancer->lbmethod = provider;
+ balancer->s->lbmethod = provider;
return NULL;
}
return "unknown lbmethod";
@@ -2348,7 +2348,7 @@ static int proxy_status_hook(request_rec
ap_rprintf(r, "</td><td>%" APR_TIME_T_FMT "</td>",
apr_time_sec(balancer->s->timeout));
ap_rprintf(r, "<td>%s</td>\n",
- balancer->lbmethod->name);
+ balancer->s->lbmethod->name);
ap_rputs("</table>\n", r);
ap_rputs("\n\n<table border=\"0\"><tr>"
"<th>Sch</th><th>Host</th><th>Stat</th>"
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=1065750&r1=1065749&r2=1065750&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Mon Jan 31 20:29:01 2011
@@ -368,6 +368,7 @@ typedef struct {
char nonce[APR_UUID_FORMATTED_LENGTH + 1];
apr_interval_time_t timeout; /* Timeout for waiting on free connection */
apr_time_t updated; /* timestamp of last update */
+ proxy_balancer_method *lbmethod;
int max_attempts; /* Number of attempts before failing */
int index; /* shm array index */
int sticky_force:1; /* Disable failover for sticky sessions */
@@ -382,7 +383,6 @@ struct proxy_balancer {
apr_array_header_t *workers; /* initially configured workers */
apr_array_header_t *errstatuses; /* statuses to force members into error */
ap_slotmem_instance_t *slot; /* worker shm data - runtime */
- proxy_balancer_method *lbmethod;
int growth; /* number of post-config workers can added */
int max_workers; /* maximum number of allowed workers */
const char *name; /* name of the load balancer */
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=1065750&r1=1065749&r2=1065750&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Mon Jan 31 20:29:01 2011
@@ -331,7 +331,7 @@ static proxy_worker *find_best_worker(pr
return NULL;
}
- candidate = (*balancer->lbmethod->finder)(balancer, r);
+ candidate = (*balancer->s->lbmethod->finder)(balancer, r);
if (candidate)
candidate->s->elected++;
@@ -480,9 +480,9 @@ static int proxy_balancer_pre_request(pr
/* Step 4: find the session route */
runtime = find_session_route(*balancer, r, &route, &sticky, url);
if (runtime) {
- if ((*balancer)->lbmethod && (*balancer)->lbmethod->updatelbstatus) {
+ if ((*balancer)->s->lbmethod && (*balancer)->s->lbmethod->updatelbstatus) {
/* Call the LB implementation */
- (*balancer)->lbmethod->updatelbstatus(*balancer, runtime, r->server);
+ (*balancer)->s->lbmethod->updatelbstatus(*balancer, runtime, r->server);
}
else { /* Use the default one */
int i, total_factor = 0;
@@ -1005,7 +1005,7 @@ static int balancer_handler(request_rec
apr_time_sec(balancer->s->timeout));
ap_rprintf(r, "<td align=\"center\">%d</td>\n", \
balancer->s->max_attempts); ap_rprintf(r, "<td align=\"center\">%s</td>\n",
- balancer->lbmethod->name);
+ balancer->s->lbmethod->name);
ap_rputs("</table>\n<br />", r);
ap_rputs("\n\n<table border=\"0\" style=\"text-align: left;\"><tr>"
"<th>Worker URL</th>"
@@ -1146,8 +1146,8 @@ static void balancer_child_init(apr_pool
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s, \
"slotmem_attach failed"); exit(1); /* Ugly, but what else? */
}
- if (balancer->lbmethod && balancer->lbmethod->reset)
- balancer->lbmethod->reset(balancer, s);
+ if (balancer->s->lbmethod && balancer->s->lbmethod->reset)
+ balancer->s->lbmethod->reset(balancer, s);
init_balancer_members(conf, s, balancer);
balancer++;
}
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1065750&r1=1065749&r2=1065750&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Mon Jan 31 20:29:01 2011
@@ -1370,7 +1370,7 @@ PROXY_DECLARE(char *) ap_proxy_define_ba
memset(bshared, 0, sizeof(proxy_balancer_shared));
- (*balancer)->lbmethod = lbmethod;
+ bshared->lbmethod = lbmethod;
bshared->updated = apr_time_now();
bshared->was_malloced = (do_malloc != 0);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic