/* Set default number of attempts to the number of
* workers.
*/
- if (!balancer->max_attempts_set && balancer->workers->nelts > 1) {
- balancer->max_attempts = balancer->workers->nelts - 1;
- balancer->max_attempts_set = 1;
+ if (!balancer->s->max_attempts_set && balancer->workers->nelts > 1) {
+ balancer->s->max_attempts = balancer->workers->nelts - 1;
+ balancer->s->max_attempts_set = 1;
}
}
{
proxy_worker *worker = NULL;
- if (!balancer->sticky)
+ if (!*balancer->s->sticky)
return NULL;
/* Try to find the sticky route inside url */
- *route = get_path_param(r->pool, *url, balancer->sticky_path, balancer->scolonsep);
+ *route = get_path_param(r->pool, *url, balancer->s->sticky_path, balancer->s->scolonsep);
if (*route) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"proxy: BALANCER: Found value %s for "
- "stickysession %s", *route, balancer->sticky_path);
- *sticky_used = balancer->sticky_path;
+ "stickysession %s", *route, balancer->s->sticky_path);
+ *sticky_used = balancer->s->sticky_path;
}
else {
- *route = get_cookie_param(r, balancer->sticky);
+ *route = get_cookie_param(r, balancer->s->sticky);
if (*route) {
- *sticky_used = balancer->sticky;
+ *sticky_used = balancer->s->sticky;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"proxy: BALANCER: Found value %s for "
- "stickysession %s", *route, balancer->sticky);
+ "stickysession %s", *route, balancer->s->sticky);
}
}
/*
return NULL;
}
- candidate = (*balancer->lbmethod->finder)(balancer, r);
+ candidate = (*balancer->s->lbmethod->finder)(balancer, r);
if (candidate)
candidate->s->elected++;
* By default the timeout is not set, and the server
* returns SERVER_BUSY.
*/
- if (balancer->timeout) {
+ if (balancer->s->timeout) {
/* XXX: This can perhaps be build using some
* smarter mechanism, like tread_cond.
* But since the statuses can came from
* different childs, use the provided algo.
*/
- apr_interval_time_t timeout = balancer->timeout;
+ apr_interval_time_t timeout = balancer->s->timeout;
apr_interval_time_t step, tval = 0;
/* Set the timeout to 0 so that we don't
* end in infinite loop
*/
- balancer->timeout = 0;
+ balancer->s->timeout = 0;
step = timeout / 100;
while (tval < timeout) {
apr_sleep(step);
tval += step;
}
/* restore the timeout */
- balancer->timeout = timeout;
+ balancer->s->timeout = timeout;
}
}
/* 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;
*worker = runtime;
}
- else if (route && (*balancer)->sticky_force) {
+ else if (route && (*balancer)->s->sticky_force) {
int i, member_of = 0;
proxy_worker **workers;
/*
return HTTP_SERVICE_UNAVAILABLE;
}
- if ((*balancer)->sticky && runtime) {
+ if (*(*balancer)->s->sticky && runtime) {
/*
* This balancer has sticky sessions and the client either has not
* supplied any routing information or all workers for this route
static int balancer_post_config(apr_pool_t *pconf, apr_pool_t *plog,
apr_pool_t *ptemp, server_rec *s)
{
+ apr_status_t rv;
void *data;
void *sconf = s->module_config;
proxy_server_conf *conf = (proxy_server_conf *) ap_get_module_config(sconf, &proxy_module);
const char *userdata_key = "mod_proxy_balancer_init";
+ ap_slotmem_instance_t *new = NULL;
/* balancer_post_config() will be called twice during startup. So, only
* set up the static data the 1st time through. */
}
/*
- * Get worker slotmem setup
+ * Get slotmem setups
*/
storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shared", "0");
if (!storage) {
"ap_lookup_provider %s failed", AP_SLOTMEM_PROVIDER_GROUP);
return !OK;
}
+
+
/*
* Go thru each Vhost and create the shared mem slotmem for
* each balancer's workers
*/
while (s) {
int i,j;
- apr_status_t rv;
proxy_balancer *balancer;
sconf = s->module_config;
conf = (proxy_server_conf *)ap_get_module_config(sconf, &proxy_module);
+ if (conf->balancers->nelts) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Doing balancers create: %d, %d",
+ (int)ALIGNED_PROXY_BALANCER_SHARED_SIZE,
+ (int)conf->balancers->nelts);
+
+ rv = storage->create(&new, conf->id,
+ ALIGNED_PROXY_BALANCER_SHARED_SIZE,
+ conf->balancers->nelts, AP_SLOTMEM_TYPE_PREGRAB, pconf);
+ if (rv != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "balancer slotmem_create failed");
+ return !OK;
+ }
+ conf->slot = new;
+ }
+
/* Initialize shared scoreboard data */
balancer = (proxy_balancer *)conf->balancers->elts;
for (i = 0; i < conf->balancers->nelts; i++, balancer++) {
proxy_worker **workers;
proxy_worker *worker;
- ap_slotmem_instance_t *new = NULL;
+ proxy_balancer_shared *bshm;
+ unsigned int index;
balancer->max_workers = balancer->workers->nelts + balancer->growth;
- balancer->sname = ap_md5(pconf, (const unsigned char *)balancer->name);
+ /* no need for the 'balancer://' prefix */
+ ap_pstr2_alnum(pconf, balancer->name + sizeof(BALANCER_PREFIX) - 1,
+ &balancer->sname);
+ balancer->sname = apr_pstrcat(pconf, conf->id, "_", balancer->sname, NULL);
/* Create global mutex */
rv = ap_global_mutex_create(&(balancer->mutex), NULL, balancer_mutex_type,
apr_pool_cleanup_register(pconf, (void *)s, lock_remove,
apr_pool_cleanup_null);
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Doing create: %s (%s), %d, %d",
+ /* setup shm for balancers */
+ if ((rv = storage->grab(conf->slot, &index)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "balancer slotmem_grab failed");
+ return !OK;
+
+ }
+ if ((rv = storage->dptr(conf->slot, index, (void *)&bshm)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "balancer slotmem_dptr failed");
+ return !OK;
+ }
+ if ((rv = ap_proxy_share_balancer(balancer, bshm, index)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "Cannot share balancer");
+ return !OK;
+ }
+
+ /* create slotmem slots for workers */
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Doing workers create: %s (%s), %d, %d",
balancer->name, balancer->sname,
(int)ALIGNED_PROXY_WORKER_SHARED_SIZE,
(int)balancer->max_workers);
ALIGNED_PROXY_WORKER_SHARED_SIZE,
balancer->max_workers, AP_SLOTMEM_TYPE_PREGRAB, pconf);
if (rv != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "slotmem_create failed");
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "worker slotmem_create failed");
return !OK;
}
balancer->slot = new;
+ /* now go thru each worker */
workers = (proxy_worker **)balancer->workers->elts;
for (j = 0; j < balancer->workers->nelts; j++, workers++) {
proxy_worker_shared *shm;
- unsigned int index;
worker = *workers;
if ((rv = storage->grab(balancer->slot, &index)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "slotmem_grab failed");
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "worker slotmem_grab failed");
return !OK;
}
if ((rv = storage->dptr(balancer->slot, index, (void *)&shm)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "slotmem_dptr failed");
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "worker slotmem_dptr failed");
return !OK;
}
if ((rv = ap_proxy_share_worker(worker, shm, index)) != APR_SUCCESS) {
apr_table_t *params;
int access_status;
int i, n;
+ int ok2change = 1;
const char *name;
/* is this for us? */
/* Check that the supplied nonce matches this server's nonce;
* otherwise ignore all parameters, to prevent a CSRF attack. */
if (!bsel ||
- (*bsel->nonce &&
+ (*bsel->s->nonce &&
(
(name = apr_table_get(params, "nonce")) == NULL ||
- strcmp(bsel->nonce, name) != 0
+ strcmp(bsel->s->nonce, name) != 0
)
)
) {
apr_table_clear(params);
+ ok2change = 0;
}
/* First set the params */
- /*
- * Note that it is not possible set the proxy_balancer because it is not
- * in shared memory.
- */
- if (wsel) {
+ if (wsel && ok2change) {
const char *val;
if ((val = apr_table_get(params, "lf"))) {
int ival = atoi(val);
}
}
+
+ if (bsel && ok2change) {
+ const char *val;
+ if ((val = apr_table_get(params, "lbm"))) {
+ proxy_balancer_method *lbmethod;
+ lbmethod = ap_lookup_provider(PROXY_LBMETHOD, val, "0");
+ if (lbmethod)
+ bsel->s->lbmethod = lbmethod;
+ }
+ }
+
if (apr_table_get(params, "xml")) {
ap_set_content_type(r, "text/xml");
ap_rputs("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n", r);
for (i = 0; i < conf->balancers->nelts; i++) {
ap_rputs("<hr />\n<h3>LoadBalancer Status for ", r);
- ap_rvputs(r, balancer->name, "</h3>\n\n", NULL);
+ ap_rvputs(r, "<a href=\"", r->uri, "?b=",
+ balancer->name + sizeof(BALANCER_PREFIX) - 1,
+ "&nonce=", balancer->s->nonce,
+ "\">", NULL);
+ ap_rvputs(r, balancer->name, "</a></h3>\n\n", NULL);
ap_rputs("\n\n<table border=\"0\" style=\"text-align: left;\"><tr>"
"<th>MaxMembers</th><th>StickySession</th><th>Timeout</th><th>FailoverAttempts</th><th>Method</th>"
"</tr>\n<tr>", r);
ap_rprintf(r, "<td align=\"center\">%d</td>\n", balancer->max_workers);
- if (balancer->sticky) {
- if (strcmp(balancer->sticky, balancer->sticky_path)) {
- ap_rvputs(r, "<td align=\"center\">", balancer->sticky, " | ",
- balancer->sticky_path, NULL);
+ if (*balancer->s->sticky) {
+ if (strcmp(balancer->s->sticky, balancer->s->sticky_path)) {
+ ap_rvputs(r, "<td align=\"center\">", balancer->s->sticky, " | ",
+ balancer->s->sticky_path, NULL);
}
else {
- ap_rvputs(r, "<td align=\"center\">", balancer->sticky, NULL);
+ ap_rvputs(r, "<td align=\"center\">", balancer->s->sticky, NULL);
}
}
else {
ap_rputs("<td align=\"center\"> - ", r);
}
ap_rprintf(r, "</td><td align=\"center\">%" APR_TIME_T_FMT "</td>",
- apr_time_sec(balancer->timeout));
- ap_rprintf(r, "<td align=\"center\">%d</td>\n", balancer->max_attempts);
+ 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>"
ap_rvputs(r, "<tr>\n<td><a href=\"", r->uri, "?b=",
balancer->name + sizeof(BALANCER_PREFIX) - 1, "&w=",
ap_escape_uri(r->pool, worker->s->name),
- "&nonce=", balancer->nonce,
+ "&nonce=", balancer->s->nonce,
"\">", NULL);
ap_rvputs(r, worker->s->name, "</a></td>", NULL);
ap_rvputs(r, "<td align=\"center\">", ap_escape_html(r->pool, worker->s->route),
ap_escape_html(r->pool, worker->s->redirect), NULL);
ap_rprintf(r, "</td><td align=\"center\">%d</td>", worker->s->lbfactor);
ap_rprintf(r, "<td align=\"center\">%d</td><td align=\"center\">", worker->s->lbset);
- if (worker->s->status & PROXY_WORKER_DISABLED)
- ap_rputs("Dis ", r);
- if (worker->s->status & PROXY_WORKER_IN_ERROR)
- ap_rputs("Err ", r);
- if (worker->s->status & PROXY_WORKER_STOPPED)
- ap_rputs("Stop ", r);
- if (worker->s->status & PROXY_WORKER_HOT_STANDBY)
- ap_rputs("Stby ", r);
- if (PROXY_WORKER_IS_USABLE(worker))
- ap_rputs("Ok", r);
- if (!PROXY_WORKER_IS_INITIALIZED(worker))
- ap_rputs("-", r);
+ ap_rvputs(r, ap_proxy_parse_wstatus(r->pool, worker), NULL);
ap_rputs("</td>", r);
ap_rprintf(r, "<td align=\"center\">%" APR_SIZE_T_FMT "</td><td align=\"center\">", worker->s->elected);
ap_rputs(apr_strfsize(worker->s->transferred, fbuf), r);
ap_rvputs(r, "value=\"", bsel->name + sizeof(BALANCER_PREFIX) - 1,
"\">\n", NULL);
ap_rvputs(r, "<input type=hidden name=\"nonce\" value=\"",
- bsel->nonce, "\">\n", NULL);
+ bsel->s->nonce, "\">\n", NULL);
+ ap_rvputs(r, "</form>\n", NULL);
+ ap_rputs("<hr />\n", r);
+ } else if (bsel) {
+ const apr_array_header_t *provs;
+ const ap_list_provider_names_t *pname;
+ int i;
+ ap_rputs("<h3>Edit balancer settings for ", r);
+ ap_rvputs(r, bsel->name, "</h3>\n", NULL);
+ ap_rvputs(r, "<form method=\"GET\" action=\"", NULL);
+ ap_rvputs(r, r->uri, "\">\n<dl>\n<table>\n", NULL);
+ provs = ap_list_provider_names(r->pool, PROXY_LBMETHOD, "0");
+ if (provs) {
+ ap_rputs("<tr><td>LBmethod:</td>", r);
+ ap_rputs("<td>\n<select name=\"lbm\" id=\"lbm\">", r);
+ pname = (ap_list_provider_names_t *)provs->elts;
+ for (i = 0; i < provs->nelts; i++, pname++) {
+ ap_rvputs(r,"<option value=\"", pname->provider_name, "\"", NULL);
+ if (strcmp(pname->provider_name, bsel->s->lbmethod->name) == 0)
+ ap_rputs(" selected ", r);
+ ap_rvputs(r, ">", pname->provider_name, "\n", NULL);
+ }
+ ap_rputs("</select>\n</td></tr>\n", r);
+ }
+ ap_rputs("</td></tr>\n", r);
+ ap_rputs("<tr><td colspan=2><input type=submit value=\"Submit\"></td></tr>\n", r);
+ ap_rvputs(r, "</table>\n<input type=hidden name=\"b\" ", NULL);
+ ap_rvputs(r, "value=\"", bsel->name + sizeof(BALANCER_PREFIX) - 1,
+ "\">\n", NULL);
+ ap_rvputs(r, "<input type=hidden name=\"nonce\" value=\"",
+ bsel->s->nonce, "\">\n", NULL);
ap_rvputs(r, "</form>\n", NULL);
ap_rputs("<hr />\n", r);
}
ap_rputs(ap_psignature("",r), r);
ap_rputs("</body></html>\n", r);
- }
+}
return OK;
}
int i;
void *sconf = s->module_config;
proxy_server_conf *conf = (proxy_server_conf *)ap_get_module_config(sconf, &proxy_module);
+ apr_size_t size;
+ unsigned int num;
apr_status_t rv;
+ if (conf->balancers->nelts) {
+ storage->attach(&(conf->slot), conf->id, &size, &num, p);
+ if (!conf->slot) {
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s, "slotmem_attach failed");
+ exit(1); /* Ugly, but what else? */
+ }
+ }
+
balancer = (proxy_balancer *)conf->balancers->elts;
for (i = 0; i < conf->balancers->nelts; i++) {
- apr_size_t size;
- unsigned int num;
/*
* for each balancer we need to init the global
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++;
}
projects / apache / blobdiff