module AP_MODULE_DECLARE_DATA proxy_balancer_module;
+static APR_OPTIONAL_FN_TYPE(set_worker_hc_param) *set_worker_hc_param_f = NULL;
+
+static int (*ap_proxy_retry_worker_fn)(const char *proxy_function,
+ proxy_worker *worker, server_rec *s) = NULL;
+
/*
* Register our mutex type before the config is read so we
* can adjust the mutex settings using the Mutex directive.
if (rv != APR_SUCCESS) {
return rv;
}
-
+ set_worker_hc_param_f = APR_RETRIEVE_OPTIONAL_FN(set_worker_hc_param);
return OK;
}
apr_port_t port = 0;
/* TODO: offset of BALANCER_PREFIX ?? */
- if (strncasecmp(url, "balancer:", 9) == 0) {
+ if (ap_casecmpstrn(url, "balancer:", 9) == 0) {
url += 9;
}
else {
return DECLINED;
}
- ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, r->server,
- "proxy: BALANCER: canonicalising URL %s", url);
+ ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, "canonicalising URL %s", url);
/* do syntatic check.
* We break the URL into host, port, path, search
*/
err = ap_proxy_canon_netloc(r->pool, &url, NULL, NULL, &host, &port);
if (err) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01157)
"error parsing URL %s: %s",
url, err);
return HTTP_BAD_REQUEST;
if (path == NULL)
return HTTP_BAD_REQUEST;
- r->filename = apr_pstrcat(r->pool, "proxy:", BALANCER_PREFIX, host,
+ r->filename = apr_pstrcat(r->pool, "proxy:" BALANCER_PREFIX, host,
"/", path, (search) ? "?" : "", (search) ? search : "", NULL);
r->path_info = apr_pstrcat(r->pool, "/", path, NULL);
for (i = 0; i < balancer->workers->nelts; i++) {
int worker_is_initialized;
proxy_worker *worker = *workers;
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
- "Looking at %s -> %s initialized?", balancer->name, worker->s->name);
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01158)
+ "Looking at %s -> %s initialized?", balancer->s->name,
+ ap_proxy_worker_name(p, worker));
worker_is_initialized = PROXY_WORKER_IS_INITIALIZED(worker);
if (!worker_is_initialized) {
ap_proxy_initialize_worker(worker, s, p);
if ( (checking_standby ? !PROXY_WORKER_IS_STANDBY(worker) : PROXY_WORKER_IS_STANDBY(worker)) )
continue;
if (*(worker->s->route) && strcmp(worker->s->route, route) == 0) {
- if (worker && PROXY_WORKER_IS_USABLE(worker)) {
+ if (PROXY_WORKER_IS_USABLE(worker)) {
return worker;
} else {
/*
* The worker might still be unusable, but we try
* anyway.
*/
- ap_proxy_retry_worker("BALANCER", worker, r->server);
+ ap_proxy_retry_worker_fn("BALANCER", worker, r->server);
if (PROXY_WORKER_IS_USABLE(worker)) {
return worker;
} else {
* The worker might still be unusable, but we try
* anyway.
*/
- ap_proxy_retry_worker("BALANCER", rworker, r->server);
+ ap_proxy_retry_worker_fn("BALANCER", rworker, r->server);
}
if (rworker && PROXY_WORKER_IS_USABLE(rworker))
return rworker;
/* Try to find the sticky route inside url */
*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->s->sticky_path);
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01159)
+ "Found value %s for stickysession %s",
+ *route, balancer->s->sticky_path);
*sticky_used = balancer->s->sticky_path;
}
else {
*route = get_cookie_param(r, balancer->s->sticky);
if (*route) {
*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->s->sticky);
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01160)
+ "Found value %s for stickysession %s",
+ *route, balancer->s->sticky);
}
}
/*
- * If we found a value for sticksession, find the first '.' within.
- * Everything after '.' (if present) is our route.
+ * If we found a value for stickysession, find the first '.' (or whatever
+ * sticky_separator is set to) within. Everything after '.' (if present)
+ * is our route.
*/
- if ((*route) && ((*route = strchr(*route, '.')) != NULL ))
+ if ((*route) && (balancer->s->sticky_separator != 0) && ((*route = strchr(*route, balancer->s->sticky_separator)) != NULL ))
(*route)++;
if ((*route) && (**route)) {
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "proxy: BALANCER: Found route %s", *route);
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01161) "Found route %s", *route);
/* We have a route in path or in cookie
* Find the worker that has this route defined.
*/
* the route supplied by the client.
*/
apr_table_setn(r->subprocess_env, "BALANCER_ROUTE_CHANGED", "1");
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "proxy: BALANCER: Route changed from %s to %s",
- *route, worker->s->route);
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01162)
+ "Route changed from %s to %s",
+ *route, worker->s->route);
}
return worker;
}
apr_status_t rv;
if ((rv = PROXY_THREAD_LOCK(balancer)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Lock failed for find_best_worker()", balancer->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01163)
+ "%s: Lock failed for find_best_worker()",
+ balancer->s->name);
return NULL;
}
candidate->s->elected++;
if ((rv = PROXY_THREAD_UNLOCK(balancer)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Unlock failed for find_best_worker()", balancer->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01164)
+ "%s: Unlock failed for find_best_worker()",
+ balancer->s->name);
}
if (candidate == NULL) {
}
else {
/* Try if we can recover */
- ap_proxy_retry_worker("BALANCER", *worker, s);
+ ap_proxy_retry_worker_fn("BALANCER", *worker, s);
if (!((*worker)->s->status & PROXY_WORKER_IN_ERROR)) {
ok = 1;
break;
}
}
}
- if (!ok) {
+ if (!ok && balancer->s->forcerecovery) {
/* If all workers are in error state force the recovery.
*/
worker = (proxy_worker **)balancer->workers->elts;
for (i = 0; i < balancer->workers->nelts; i++, worker++) {
++(*worker)->s->retries;
(*worker)->s->status &= ~PROXY_WORKER_IN_ERROR;
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
- "proxy: BALANCER: (%s). Forcing recovery for worker (%s)",
- balancer->name, (*worker)->s->hostname);
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01165)
+ "%s: Forcing recovery for worker (%s)",
+ balancer->s->name, (*worker)->s->hostname);
}
}
}
+static apr_status_t decrement_busy_count(void *worker_)
+{
+ proxy_worker *worker = worker_;
+
+ if (worker->s->busy) {
+ worker->s->busy--;
+ }
+
+ return APR_SUCCESS;
+}
+
static int proxy_balancer_pre_request(proxy_worker **worker,
proxy_balancer **balancer,
request_rec *r,
* for balancer, because this is failover attempt.
*/
if (!*balancer &&
- !(*balancer = ap_proxy_get_balancer(r->pool, conf, *url)))
+ !(*balancer = ap_proxy_get_balancer(r->pool, conf, *url, 1)))
return DECLINED;
/* Step 2: Lock the LoadBalancer
* XXX: perhaps we need the process lock here
*/
if ((rv = PROXY_THREAD_LOCK(*balancer)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Lock failed for pre_request",
- (*balancer)->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01166)
+ "%s: Lock failed for pre_request", (*balancer)->s->name);
return DECLINED;
}
workers++;
}
if (member_of) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "proxy: BALANCER: (%s). All workers are in error state for route (%s)",
- (*balancer)->name, route);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01167)
+ "%s: All workers are in error state for route (%s)",
+ (*balancer)->s->name, route);
if ((rv = PROXY_THREAD_UNLOCK(*balancer)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Unlock failed for pre_request",
- (*balancer)->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01168)
+ "%s: Unlock failed for pre_request",
+ (*balancer)->s->name);
}
return HTTP_SERVICE_UNAVAILABLE;
}
}
if ((rv = PROXY_THREAD_UNLOCK(*balancer)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Unlock failed for pre_request",
- (*balancer)->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01169)
+ "%s: Unlock failed for pre_request",
+ (*balancer)->s->name);
}
if (!*worker) {
runtime = find_best_worker(*balancer, r);
if (!runtime) {
if ((*balancer)->workers->nelts) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "proxy: BALANCER: (%s). All workers are in error state",
- (*balancer)->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01170)
+ "%s: All workers are in error state",
+ (*balancer)->s->name);
} else {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
- "proxy: BALANCER: (%s). No workers in balancer",
- (*balancer)->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01171)
+ "%s: No workers in balancer",
+ (*balancer)->s->name);
}
return HTTP_SERVICE_UNAVAILABLE;
}
(*worker)->s->busy++;
+ apr_pool_cleanup_register(r->pool, *worker, decrement_busy_count,
+ apr_pool_cleanup_null);
/* Add balancer/worker info to env. */
apr_table_setn(r->subprocess_env,
- "BALANCER_NAME", (*balancer)->name);
+ "BALANCER_NAME", (*balancer)->s->name);
apr_table_setn(r->subprocess_env,
"BALANCER_WORKER_NAME", (*worker)->s->name);
apr_table_setn(r->subprocess_env,
apr_table_setn(r->subprocess_env,
"BALANCER_SESSION_ROUTE", route);
}
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "proxy: BALANCER (%s) worker (%s) rewritten to %s",
- (*balancer)->name, (*worker)->s->name, *url);
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01172)
+ "%s: worker (%s) rewritten to %s",
+ (*balancer)->s->name, (*worker)->s->name, *url);
return access_status;
}
apr_status_t rv;
if ((rv = PROXY_THREAD_LOCK(balancer)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Lock failed for post_request",
- balancer->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01173)
+ "%s: Lock failed for post_request",
+ balancer->s->name);
return HTTP_INTERNAL_SERVER_ERROR;
}
- if (!apr_is_empty_array(balancer->errstatuses)) {
+ if (!apr_is_empty_array(balancer->errstatuses)
+ && !(worker->s->status & PROXY_WORKER_IGNORE_ERRORS)) {
int i;
for (i = 0; i < balancer->errstatuses->nelts; i++) {
int val = ((int *)balancer->errstatuses->elts)[i];
if (r->status == val) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Forcing recovery for worker (%s), failonstatus %d",
- balancer->name, worker->s->name, val);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01174)
+ "%s: Forcing worker (%s) into error state "
+ "due to status code %d matching 'failonstatus' "
+ "balancer parameter",
+ balancer->s->name, ap_proxy_worker_name(r->pool, worker),
+ val);
worker->s->status |= PROXY_WORKER_IN_ERROR;
worker->s->error_time = apr_time_now();
break;
}
}
- if ((rv = PROXY_THREAD_UNLOCK(balancer)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Unlock failed for post_request",
- balancer->name);
+ if (balancer->failontimeout
+ && !(worker->s->status & PROXY_WORKER_IGNORE_ERRORS)
+ && (apr_table_get(r->notes, "proxy_timedout")) != NULL) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02460)
+ "%s: Forcing worker (%s) into error state "
+ "due to timeout and 'failontimeout' parameter being set",
+ balancer->s->name, ap_proxy_worker_name(r->pool, worker));
+ worker->s->status |= PROXY_WORKER_IN_ERROR;
+ worker->s->error_time = apr_time_now();
+
}
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
- "proxy_balancer_post_request for (%s)", balancer->name);
- if (worker && worker->s->busy)
- worker->s->busy--;
+ if ((rv = PROXY_THREAD_UNLOCK(balancer)) != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01175)
+ "%s: Unlock failed for post_request", balancer->s->name);
+ }
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01176)
+ "proxy_balancer_post_request for (%s)", balancer->s->name);
return OK;
-
}
static void recalc_factors(proxy_balancer *balancer)
apr_pool_t *ptemp, server_rec *s)
{
apr_status_t rv;
- void *sconf = s->module_config;
- proxy_server_conf *conf = (proxy_server_conf *) ap_get_module_config(sconf, &proxy_module);
+ proxy_server_conf *conf;
ap_slotmem_instance_t *new = NULL;
apr_time_t tstamp;
/* balancer_post_config() will be called twice during startup. So, don't
* set up the static data the 1st time through. */
- if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG)
+ if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) {
return OK;
+ }
+
+ if (!ap_proxy_retry_worker_fn) {
+ ap_proxy_retry_worker_fn =
+ APR_RETRIEVE_OPTIONAL_FN(ap_proxy_retry_worker);
+ if (!ap_proxy_retry_worker_fn) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(02230)
+ "mod_proxy must be loaded for mod_proxy_balancer");
+ return !OK;
+ }
+ }
/*
* Get slotmem setups
*/
- storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shared",
+ storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shm",
AP_SLOTMEM_PROVIDER_VERSION);
if (!storage) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s,
- "ap_lookup_provider %s failed: is mod_slotmem_shm loaded??",
+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01177)
+ "Failed to lookup provider 'shm' for '%s': is "
+ "mod_slotmem_shm loaded??",
AP_SLOTMEM_PROVIDER_GROUP);
return !OK;
}
*/
while (s) {
int i,j;
+ char *id;
proxy_balancer *balancer;
- sconf = s->module_config;
+ ap_slotmem_type_t type;
+ void *sconf = s->module_config;
conf = (proxy_server_conf *)ap_get_module_config(sconf, &proxy_module);
-
+ /*
+ * During create_proxy_config() we created a dummy id. Now that
+ * we have identifying info, we can create the real id
+ */
+ id = apr_psprintf(pconf, "%s.%s.%d.%s.%s.%u.%s",
+ (s->server_scheme ? s->server_scheme : "????"),
+ (s->server_hostname ? s->server_hostname : "???"),
+ (int)s->port,
+ (s->server_admin ? s->server_admin : "??"),
+ (s->defn_name ? s->defn_name : "?"),
+ s->defn_line_number,
+ (s->error_fname ? s->error_fname : DEFAULT_ERRORLOG));
+ conf->id = apr_psprintf(pconf, "p%x",
+ ap_proxy_hashfunc(id, PROXY_HASHFUNC_DEFAULT));
+ if (conf->bslot) {
+ /* Shared memory already created for this proxy_server_conf.
+ */
+ s = s->next;
+ continue;
+ }
+ if (conf->bal_persist) {
+ type = AP_SLOTMEM_TYPE_PERSIST;
+ } else {
+ type = 0;
+ }
if (conf->balancers->nelts) {
conf->max_balancers = conf->balancers->nelts + conf->bgrowth;
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "Doing balancers create: %d, %d (%d)",
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01178) "Doing balancers create: %d, %d (%d)",
(int)ALIGNED_PROXY_BALANCER_SHARED_SIZE,
(int)conf->balancers->nelts, conf->max_balancers);
rv = storage->create(&new, conf->id,
ALIGNED_PROXY_BALANCER_SHARED_SIZE,
- conf->max_balancers, AP_SLOTMEM_TYPE_PREGRAB, pconf);
+ conf->max_balancers, type, pconf);
if (rv != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "balancer slotmem_create failed");
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(01179) "balancer slotmem_create failed");
return !OK;
}
- conf->slot = new;
+ conf->bslot = new;
}
conf->storage = storage;
proxy_worker **workers;
proxy_worker *worker;
proxy_balancer_shared *bshm;
+ const char *sname;
unsigned int index;
+ /* now that we have the right id, we need to redo the sname field */
+ ap_pstr2_alnum(pconf, balancer->s->name + sizeof(BALANCER_PREFIX) - 1,
+ &sname);
+ sname = apr_pstrcat(pconf, conf->id, "_", sname, NULL);
+ PROXY_STRNCPY(balancer->s->sname, sname); /* We know this will succeed */
+
balancer->max_workers = balancer->workers->nelts + balancer->growth;
- /* 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->gmutex), NULL, balancer_mutex_type,
- balancer->sname, s, pconf, 0);
+ balancer->s->sname, s, pconf, 0);
if (rv != APR_SUCCESS || !balancer->gmutex) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(01180)
"mutex creation of %s : %s failed", balancer_mutex_type,
- balancer->sname);
+ balancer->s->sname);
return HTTP_INTERNAL_SERVER_ERROR;
}
apr_pool_cleanup_null);
/* 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;
-
+ bshm = ap_proxy_find_balancershm(storage, conf->bslot, balancer, &index);
+ if (bshm) {
+ if ((rv = storage->fgrab(conf->bslot, index)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(02408) "balancer slotmem_fgrab 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;
+ else {
+ if ((rv = storage->grab(conf->bslot, &index)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(01181) "balancer slotmem_grab failed");
+ return !OK;
+ }
+ if ((rv = storage->dptr(conf->bslot, index, (void *)&bshm)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(01182) "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");
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(01183) "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,
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01184) "Doing workers create: %s (%s), %d, %d [%u]",
+ balancer->s->name, balancer->s->sname,
(int)ALIGNED_PROXY_WORKER_SHARED_SIZE,
- (int)balancer->max_workers);
+ (int)balancer->max_workers, i);
- rv = storage->create(&new, balancer->sname,
+ rv = storage->create(&new, balancer->s->sname,
ALIGNED_PROXY_WORKER_SHARED_SIZE,
- balancer->max_workers, AP_SLOTMEM_TYPE_PREGRAB, pconf);
+ balancer->max_workers, type, pconf);
if (rv != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "worker slotmem_create failed");
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(01185) "worker slotmem_create failed");
return !OK;
}
- balancer->slot = new;
+ balancer->wslot = new;
balancer->storage = storage;
/* sync all timestamps */
proxy_worker_shared *shm;
worker = *workers;
- if ((rv = storage->grab(balancer->slot, &index)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "worker slotmem_grab failed");
- return !OK;
+ shm = ap_proxy_find_workershm(storage, balancer->wslot, worker, &index);
+ if (shm) {
+ if ((rv = storage->fgrab(balancer->wslot, index)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(02409) "worker slotmem_fgrab failed");
+ return !OK;
+ }
}
- if ((rv = storage->dptr(balancer->slot, index, (void *)&shm)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "worker slotmem_dptr failed");
- return !OK;
+ else {
+ if ((rv = storage->grab(balancer->wslot, &index)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(01186) "worker slotmem_grab failed");
+ return !OK;
+
+ }
+ if ((rv = storage->dptr(balancer->wslot, index, (void *)&shm)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(01187) "worker slotmem_dptr failed");
+ return !OK;
+ }
}
if ((rv = ap_proxy_share_worker(worker, shm, index)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, "Cannot share worker");
+ ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(01188) "Cannot share worker");
return !OK;
}
worker->s->updated = tstamp;
}
+ if (conf->bal_persist) {
+ /* We could have just read-in a persisted config. Force a sync. */
+ balancer->wupdated--;
+ ap_proxy_sync_balancer(balancer, s, conf);
+ }
}
s = s->next;
}
static void create_radio(const char *name, unsigned int flag, request_rec *r)
{
- ap_rvputs(r, "<td>On <input name='", name, "' id='", name, "' value='1' type=radio", NULL);
+ ap_rvputs(r, "<td><label for='", name, "1'>On</label> <input name='", name, "' id='", name, "1' value='1' type=radio", NULL);
if (flag)
ap_rputs(" checked", r);
- ap_rvputs(r, "> <br/> Off <input name='", name, "' id='", name, "' value='0' type=radio", NULL);
+ ap_rvputs(r, "> <br/> <label for='", name, "0'>Off</label> <input name='", name, "' id='", name, "0' value='0' type=radio", NULL);
if (!flag)
ap_rputs(" checked", r);
ap_rputs("></td>\n", r);
apr_table_set(params, key, val);
}
else {
- const char *ok = *allowed;
- while (ok) {
- if (strcmp(ok, key) == 0) {
+ const char **ok = allowed;
+ while (*ok) {
+ if (strcmp(*ok, key) == 0) {
apr_table_set(params, key, val);
break;
}
balancer = (proxy_balancer *)conf->balancers->elts;
for (i = 0; i < conf->balancers->nelts; i++, balancer++) {
if ((rv = PROXY_THREAD_LOCK(balancer)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Lock failed for balancer_handler",
- balancer->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01189)
+ "%s: Lock failed for balancer_handler",
+ balancer->s->name);
}
ap_proxy_sync_balancer(balancer, r->server, conf);
if ((rv = PROXY_THREAD_UNLOCK(balancer)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Unlock failed for balancer_handler",
- balancer->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01190)
+ "%s: Unlock failed for balancer_handler",
+ balancer->s->name);
}
}
if (r->args && (r->method_number == M_GET)) {
- const char *allowed[] = { "w", "b", "nonce", NULL };
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "parsing r->args");
+ const char *allowed[] = { "w", "b", "nonce", "xml", NULL };
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01191) "parsing r->args");
push2table(r->args, params, allowed, r->pool);
}
rv = ap_get_brigade(r->input_filters, ib, AP_MODE_READBYTES,
APR_BLOCK_READ, len);
if (rv != APR_SUCCESS) {
- return HTTP_INTERNAL_SERVER_ERROR;
+ return ap_map_http_request_error(rv, HTTP_BAD_REQUEST);
}
apr_brigade_flatten(ib, buf, &len);
buf[len] = '\0';
}
if ((name = apr_table_get(params, "b")))
bsel = ap_proxy_get_balancer(r->pool, conf,
- apr_pstrcat(r->pool, BALANCER_PREFIX, name, NULL));
+ apr_pstrcat(r->pool, BALANCER_PREFIX, name, NULL), 0);
if ((name = apr_table_get(params, "w"))) {
wsel = ap_proxy_get_worker(r->pool, bsel, conf, name);
const char *val;
int was_usable = PROXY_WORKER_IS_USABLE(wsel);
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "settings worker params");
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01192) "settings worker params");
if ((val = apr_table_get(params, "w_lf"))) {
int ival = atoi(val);
*wsel->s->redirect = '\0';
}
if ((val = apr_table_get(params, "w_status_I"))) {
- ap_proxy_set_wstatus('I', atoi(val), wsel);
+ ap_proxy_set_wstatus(PROXY_WORKER_IGNORE_ERRORS_FLAG, atoi(val), wsel);
}
if ((val = apr_table_get(params, "w_status_N"))) {
- ap_proxy_set_wstatus('N', atoi(val), wsel);
+ ap_proxy_set_wstatus(PROXY_WORKER_DRAIN_FLAG, atoi(val), wsel);
}
if ((val = apr_table_get(params, "w_status_D"))) {
- ap_proxy_set_wstatus('D', atoi(val), wsel);
+ ap_proxy_set_wstatus(PROXY_WORKER_DISABLED_FLAG, atoi(val), wsel);
}
if ((val = apr_table_get(params, "w_status_H"))) {
- ap_proxy_set_wstatus('H', atoi(val), wsel);
+ ap_proxy_set_wstatus(PROXY_WORKER_HOT_STANDBY_FLAG, atoi(val), wsel);
}
if ((val = apr_table_get(params, "w_ls"))) {
int ival = atoi(val);
if (bsel && ok2change) {
const char *val;
int ival;
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "settings balancer params");
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01193)
+ "settings balancer params");
if ((val = apr_table_get(params, "b_lbm"))) {
if ((strlen(val) < (sizeof(bsel->s->lbpname)-1)) &&
strcmp(val, bsel->s->lbpname)) {
(val = apr_table_get(params, "b_nwrkr"))) {
char *ret;
proxy_worker *nworker;
- nworker = ap_proxy_get_worker(conf->pool, bsel, conf, val);
- if (!nworker && storage->num_free_slots(bsel->slot)) {
+ nworker = ap_proxy_get_worker(r->pool, bsel, conf, val);
+ if (!nworker && storage->num_free_slots(bsel->wslot)) {
if ((rv = PROXY_GLOBAL_LOCK(bsel)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Lock failed for adding worker",
- bsel->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01194)
+ "%s: Lock failed for adding worker",
+ bsel->s->name);
}
ret = ap_proxy_define_worker(conf->pool, &nworker, bsel, conf, val, 0);
if (!ret) {
unsigned int index;
proxy_worker_shared *shm;
PROXY_COPY_CONF_PARAMS(nworker, conf);
- if ((rv = storage->grab(bsel->slot, &index)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, r->server, "worker slotmem_grab failed");
+ if ((rv = storage->grab(bsel->wslot, &index)) != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_EMERG, rv, r, APLOGNO(01195)
+ "worker slotmem_grab failed");
if ((rv = PROXY_GLOBAL_UNLOCK(bsel)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Unlock failed for adding worker",
- bsel->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01196)
+ "%s: Unlock failed for adding worker",
+ bsel->s->name);
}
return HTTP_BAD_REQUEST;
}
- if ((rv = storage->dptr(bsel->slot, index, (void *)&shm)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, r->server, "worker slotmem_dptr failed");
+ if ((rv = storage->dptr(bsel->wslot, index, (void *)&shm)) != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_EMERG, rv, r, APLOGNO(01197)
+ "worker slotmem_dptr failed");
if ((rv = PROXY_GLOBAL_UNLOCK(bsel)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Unlock failed for adding worker",
- bsel->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01198)
+ "%s: Unlock failed for adding worker",
+ bsel->s->name);
}
return HTTP_BAD_REQUEST;
}
if ((rv = ap_proxy_share_worker(nworker, shm, index)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, r->server, "Cannot share worker");
+ ap_log_rerror(APLOG_MARK, APLOG_EMERG, rv, r, APLOGNO(01199)
+ "Cannot share worker");
if ((rv = PROXY_GLOBAL_UNLOCK(bsel)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Unlock failed for adding worker",
- bsel->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01200)
+ "%s: Unlock failed for adding worker",
+ bsel->s->name);
}
return HTTP_BAD_REQUEST;
}
if ((rv = ap_proxy_initialize_worker(nworker, r->server, conf->pool)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, rv, r->server, "Cannot init worker");
+ ap_log_rerror(APLOG_MARK, APLOG_EMERG, rv, r, APLOGNO(01201)
+ "Cannot init worker");
if ((rv = PROXY_GLOBAL_UNLOCK(bsel)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Unlock failed for adding worker",
- bsel->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01202)
+ "%s: Unlock failed for adding worker",
+ bsel->s->name);
}
return HTTP_BAD_REQUEST;
}
/* sync all timestamps */
bsel->wupdated = bsel->s->wupdated = nworker->s->updated = apr_time_now();
/* by default, all new workers are disabled */
- ap_proxy_set_wstatus('D', 1, nworker);
+ ap_proxy_set_wstatus(PROXY_WORKER_DISABLED_FLAG, 1, nworker);
}
if ((rv = PROXY_GLOBAL_UNLOCK(bsel)) != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
- "proxy: BALANCER: (%s). Unlock failed for adding worker",
- bsel->name);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01203)
+ "%s: Unlock failed for adding worker",
+ bsel->s->name);
}
}
}
action = ap_construct_url(r->pool, r->uri, r);
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "genning page");
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01204) "genning page");
if (apr_table_get(params, "xml")) {
+ char date[APR_RFC822_DATE_LEN];
ap_set_content_type(r, "text/xml");
ap_rputs("<?xml version='1.0' encoding='UTF-8' ?>\n", r);
ap_rputs("<httpd:manager xmlns:httpd='http://httpd.apache.org'>\n", r);
balancer = (proxy_balancer *)conf->balancers->elts;
for (i = 0; i < conf->balancers->nelts; i++) {
ap_rputs(" <httpd:balancer>\n", r);
- ap_rvputs(r, " <httpd:name>", balancer->name, "</httpd:name>\n", NULL);
+ /* Start proxy_balancer */
+ ap_rvputs(r, " <httpd:name>", balancer->s->name, "</httpd:name>\n", NULL);
+ if (*balancer->s->sticky) {
+ ap_rvputs(r, " <httpd:stickysession>", balancer->s->sticky,
+ "</httpd:stickysession>\n", NULL);
+ ap_rprintf(r,
+ " <httpd:nofailover>%s</httpd:nofailover>\n",
+ (balancer->s->sticky_force ? "On" : "Off"));
+ }
+ ap_rprintf(r,
+ " <httpd:timeout>%" APR_TIME_T_FMT "</httpd:timeout>",
+ apr_time_sec(balancer->s->timeout));
+ if (balancer->s->max_attempts_set) {
+ ap_rprintf(r,
+ " <httpd:maxattempts>%d</httpd:maxattempts>\n",
+ balancer->s->max_attempts);
+ }
+ ap_rvputs(r, " <httpd:lbmethod>", balancer->lbmethod->name,
+ "</httpd:lbmethod>\n", NULL);
+ if (*balancer->s->sticky) {
+ ap_rprintf(r,
+ " <httpd:scolonpathdelim>%s</httpd:scolonpathdelim>\n",
+ (balancer->s->scolonsep ? "On" : "Off"));
+ }
+ /* End proxy_balancer */
ap_rputs(" <httpd:workers>\n", r);
workers = (proxy_worker **)balancer->workers->elts;
for (n = 0; n < balancer->workers->nelts; n++) {
worker = *workers;
+ /* Start proxy_worker */
ap_rputs(" <httpd:worker>\n", r);
+ ap_rvputs(r, " <httpd:name>", ap_proxy_worker_name(r->pool, worker),
+ "</httpd:name>\n", NULL);
ap_rvputs(r, " <httpd:scheme>", worker->s->scheme,
"</httpd:scheme>\n", NULL);
ap_rvputs(r, " <httpd:hostname>", worker->s->hostname,
"</httpd:hostname>\n", NULL);
ap_rprintf(r, " <httpd:loadfactor>%d</httpd:loadfactor>\n",
worker->s->lbfactor);
+ ap_rprintf(r,
+ " <httpd:port>%d</httpd:port>\n",
+ worker->s->port);
+ ap_rprintf(r, " <httpd:min>%d</httpd:min>\n",
+ worker->s->min);
+ ap_rprintf(r, " <httpd:smax>%d</httpd:smax>\n",
+ worker->s->smax);
+ ap_rprintf(r, " <httpd:max>%d</httpd:max>\n",
+ worker->s->hmax);
+ ap_rprintf(r,
+ " <httpd:ttl>%" APR_TIME_T_FMT "</httpd:ttl>\n",
+ apr_time_sec(worker->s->ttl));
+ if (worker->s->timeout_set) {
+ ap_rprintf(r,
+ " <httpd:timeout>%" APR_TIME_T_FMT "</httpd:timeout>\n",
+ apr_time_sec(worker->s->timeout));
+ }
+ if (worker->s->acquire_set) {
+ ap_rprintf(r,
+ " <httpd:acquire>%" APR_TIME_T_FMT "</httpd:acquire>\n",
+ apr_time_msec(worker->s->acquire));
+ }
+ if (worker->s->recv_buffer_size_set) {
+ ap_rprintf(r,
+ " <httpd:recv_buffer_size>%" APR_SIZE_T_FMT "</httpd:recv_buffer_size>\n",
+ worker->s->recv_buffer_size);
+ }
+ if (worker->s->io_buffer_size_set) {
+ ap_rprintf(r,
+ " <httpd:io_buffer_size>%" APR_SIZE_T_FMT "</httpd:io_buffer_size>\n",
+ worker->s->io_buffer_size);
+ }
+ if (worker->s->keepalive_set) {
+ ap_rprintf(r,
+ " <httpd:keepalive>%s</httpd:keepalive>\n",
+ (worker->s->keepalive ? "On" : "Off"));
+ }
+ /* Begin proxy_worker_stat */
+ ap_rputs(" <httpd:status>", r);
+ if (worker->s->status & PROXY_WORKER_DISABLED)
+ ap_rputs("Disabled", r);
+ else if (worker->s->status & PROXY_WORKER_IN_ERROR)
+ ap_rputs("Error", r);
+ else if (worker->s->status & PROXY_WORKER_STOPPED)
+ ap_rputs("Stopped", r);
+ else if (worker->s->status & PROXY_WORKER_HOT_STANDBY)
+ ap_rputs("Standby", r);
+ else if (PROXY_WORKER_IS_USABLE(worker))
+ ap_rputs("OK", r);
+ else if (!PROXY_WORKER_IS_INITIALIZED(worker))
+ ap_rputs("Uninitialized", r);
+ ap_rputs("</httpd:status>\n", r);
+ if ((worker->s->error_time > 0) && apr_rfc822_date(date, worker->s->error_time) == APR_SUCCESS) {
+ ap_rvputs(r, " <httpd:error_time>", date,
+ "</httpd:error_time>\n", NULL);
+ }
+ ap_rprintf(r,
+ " <httpd:retries>%d</httpd:retries>\n",
+ worker->s->retries);
+ ap_rprintf(r,
+ " <httpd:lbstatus>%d</httpd:lbstatus>\n",
+ worker->s->lbstatus);
+ ap_rprintf(r,
+ " <httpd:loadfactor>%d</httpd:loadfactor>\n",
+ worker->s->lbfactor);
+ ap_rprintf(r,
+ " <httpd:transferred>%" APR_OFF_T_FMT "</httpd:transferred>\n",
+ worker->s->transferred);
+ ap_rprintf(r,
+ " <httpd:read>%" APR_OFF_T_FMT "</httpd:read>\n",
+ worker->s->read);
+ ap_rprintf(r,
+ " <httpd:elected>%" APR_SIZE_T_FMT "</httpd:elected>\n",
+ worker->s->elected);
+ ap_rvputs(r, " <httpd:route>",
+ ap_escape_html(r->pool, worker->s->route),
+ "</httpd:route>\n", NULL);
+ ap_rvputs(r, " <httpd:redirect>",
+ ap_escape_html(r->pool, worker->s->redirect),
+ "</httpd:redirect>\n", NULL);
+ ap_rprintf(r,
+ " <httpd:busy>%" APR_SIZE_T_FMT "</httpd:busy>\n",
+ worker->s->busy);
+ ap_rprintf(r, " <httpd:lbset>%d</httpd:lbset>\n",
+ worker->s->lbset);
+ /* End proxy_worker_stat */
+ if (!ap_casecmpstr(worker->s->scheme, "ajp")) {
+ ap_rputs(" <httpd:flushpackets>", r);
+ switch (worker->s->flush_packets) {
+ case flush_off:
+ ap_rputs("Off", r);
+ break;
+ case flush_on:
+ ap_rputs("On", r);
+ break;
+ case flush_auto:
+ ap_rputs("Auto", r);
+ break;
+ }
+ ap_rputs("</httpd:flushpackets>\n", r);
+ if (worker->s->flush_packets == flush_auto) {
+ ap_rprintf(r,
+ " <httpd:flushwait>%d</httpd:flushwait>\n",
+ worker->s->flush_wait);
+ }
+ if (worker->s->ping_timeout_set) {
+ ap_rprintf(r,
+ " <httpd:ping>%" APR_TIME_T_FMT "</httpd:ping>",
+ apr_time_msec(worker->s->ping_timeout));
+ }
+ }
+ if (worker->s->disablereuse_set) {
+ ap_rprintf(r,
+ " <httpd:disablereuse>%s</httpd:disablereuse>\n",
+ (worker->s->disablereuse ? "On" : "Off"));
+ }
+ if (worker->s->conn_timeout_set) {
+ ap_rprintf(r,
+ " <httpd:connectiontimeout>%" APR_TIME_T_FMT "</httpd:connectiontimeout>\n",
+ apr_time_msec(worker->s->conn_timeout));
+ }
+ if (worker->s->retry_set) {
+ ap_rprintf(r,
+ " <httpd:retry>%" APR_TIME_T_FMT "</httpd:retry>\n",
+ apr_time_sec(worker->s->retry));
+ }
ap_rputs(" </httpd:worker>\n", r);
++workers;
}
else {
ap_set_content_type(r, "text/html; charset=ISO-8859-1");
ap_rputs(DOCTYPE_HTML_3_2
- "<html><head><title>Balancer Manager</title></head>\n", r);
+ "<html><head><title>Balancer Manager</title>\n", r);
+ ap_rputs("<style type='text/css'>\n"
+ "table {\n"
+ " border-width: 1px;\n"
+ " border-spacing: 3px;\n"
+ " border-style: solid;\n"
+ " border-color: gray;\n"
+ " border-collapse: collapse;\n"
+ " background-color: white;\n"
+ " text-align: center;\n"
+ "}\n"
+ "th {\n"
+ " border-width: 1px;\n"
+ " padding: 2px;\n"
+ " border-style: dotted;\n"
+ " border-color: gray;\n"
+ " background-color: lightgray;\n"
+ " text-align: center;\n"
+ "}\n"
+ "td {\n"
+ " border-width: 1px;\n"
+ " padding: 2px;\n"
+ " border-style: dotted;\n"
+ " border-color: gray;\n"
+ " background-color: white;\n"
+ " text-align: center;\n"
+ "}\n"
+ "</style>\n</head>\n", r);
ap_rputs("<body><h1>Load Balancer Manager for ", r);
- ap_rvputs(r, ap_get_server_name(r), "</h1>\n\n", NULL);
+ ap_rvputs(r, ap_escape_html(r->pool, ap_get_server_name(r)),
+ "</h1>\n\n", NULL);
ap_rvputs(r, "<dl><dt>Server Version: ",
ap_get_server_description(), "</dt>\n", NULL);
ap_rvputs(r, "<dt>Server Built: ",
- ap_get_server_built(), "\n</dt></dl>\n", NULL);
+ ap_get_server_built(), "</dt>\n", NULL);
+ ap_rvputs(r, "<dt>Balancer changes will ", conf->bal_persist ? "" : "NOT ",
+ "be persisted on restart.</dt>", NULL);
+ ap_rvputs(r, "<dt>Balancers are ", conf->inherit ? "" : "NOT ",
+ "inherited from main server.</dt>", NULL);
+ ap_rvputs(r, "<dt>ProxyPass settings are ", conf->ppinherit ? "" : "NOT ",
+ "inherited from main server.</dt>", NULL);
+ ap_rputs("</dl>\n", r);
balancer = (proxy_balancer *)conf->balancers->elts;
for (i = 0; i < conf->balancers->nelts; i++) {
ap_rputs("<hr />\n<h3>LoadBalancer Status for ", r);
- 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>"
+ ap_rvputs(r, "<a href=\"", ap_escape_uri(r->pool, r->uri), "?b=",
+ balancer->s->name + sizeof(BALANCER_PREFIX) - 1,
+ "&nonce=", balancer->s->nonce,
+ "\">", NULL);
+ ap_rvputs(r, balancer->s->name, "</a> [",balancer->s->sname, "]</h3>\n", NULL);
+ ap_rputs("\n\n<table><tr>"
"<th>MaxMembers</th><th>StickySession</th><th>DisableFailover</th><th>Timeout</th><th>FailoverAttempts</th><th>Method</th>"
- "</tr>\n<tr>", r);
+ "<th>Path</th><th>Active</th></tr>\n<tr>", r);
/* the below is a safe cast, since the number of slots total will
* never be more than max_workers, which is restricted to int */
- ap_rprintf(r, "<td align='center'>%d [%d Used]</td>\n", balancer->max_workers,
- balancer->max_workers - (int)storage->num_free_slots(balancer->slot));
+ ap_rprintf(r, "<td>%d [%d Used]</td>\n", balancer->max_workers,
+ balancer->max_workers - (int)storage->num_free_slots(balancer->wslot));
if (*balancer->s->sticky) {
if (strcmp(balancer->s->sticky, balancer->s->sticky_path)) {
- ap_rvputs(r, "<td align='center'>", balancer->s->sticky, " | ",
+ ap_rvputs(r, "<td>", balancer->s->sticky, " | ",
balancer->s->sticky_path, NULL);
}
else {
- ap_rvputs(r, "<td align='center'>", balancer->s->sticky, NULL);
+ ap_rvputs(r, "<td>", balancer->s->sticky, NULL);
}
}
else {
- ap_rputs("<td align='center'> (None) ", r);
+ ap_rputs("<td> (None) ", r);
}
- ap_rprintf(r, "<td align='center'>%s</td>\n",
+ ap_rprintf(r, "</td><td>%s</td>\n",
balancer->s->sticky_force ? "On" : "Off");
- ap_rprintf(r, "</td><td align='center'>%" APR_TIME_T_FMT "</td>",
+ ap_rprintf(r, "<td>%" APR_TIME_T_FMT "</td>",
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",
+ ap_rprintf(r, "<td>%d</td>\n", balancer->s->max_attempts);
+ ap_rprintf(r, "<td>%s</td>\n",
balancer->s->lbpname);
+ ap_rputs("<td>", r);
+ if (*balancer->s->vhost) {
+ ap_rvputs(r, balancer->s->vhost, " -> ", NULL);
+ }
+ ap_rvputs(r, balancer->s->vpath, "</td>\n", NULL);
+ ap_rprintf(r, "<td>%s</td>\n",
+ !balancer->s->inactive ? "Yes" : "No");
ap_rputs("</table>\n<br />", r);
- ap_rputs("\n\n<table border='0' style='text-align: left;'><tr>"
+ ap_rputs("\n\n<table><tr>"
"<th>Worker URL</th>"
"<th>Route</th><th>RouteRedir</th>"
- "<th>Factor</th><th>Set</th><th align='center'>Status</th>"
- "<th>Elected</th><th>Busy</th><th>Load</th><th>To</th><th>From</th>"
- "</tr>\n", r);
+ "<th>Factor</th><th>Set</th><th>Status</th>"
+ "<th>Elected</th><th>Busy</th><th>Load</th><th>To</th><th>From</th>", r);
+ if (set_worker_hc_param_f) {
+ ap_rputs("<th>Method</th><th>Interval</th><th>Passes</th><th>Fails</th><th>URI</th>", r);
+ }
+ ap_rputs("</tr>\n", r);
workers = (proxy_worker **)balancer->workers->elts;
for (n = 0; n < balancer->workers->nelts; n++) {
char fbuf[50];
worker = *workers;
- ap_rvputs(r, "<tr>\n<td><a href='", r->uri, "?b=",
- balancer->name + sizeof(BALANCER_PREFIX) - 1, "&w=",
+ ap_rvputs(r, "<tr>\n<td><a href=\"",
+ ap_escape_uri(r->pool, r->uri), "?b=",
+ balancer->s->name + sizeof(BALANCER_PREFIX) - 1, "&w=",
ap_escape_uri(r->pool, worker->s->name),
- "&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),
+ "&nonce=", balancer->s->nonce,
+ "\">", NULL);
+ ap_rvputs(r, (*worker->s->uds_path ? "<i>" : ""), ap_proxy_worker_name(r->pool, worker),
+ (*worker->s->uds_path ? "</i>" : ""), "</a></td>", NULL);
+ ap_rvputs(r, "<td>", ap_escape_html(r->pool, worker->s->route),
NULL);
- ap_rvputs(r, "</td><td align='center'>",
+ ap_rvputs(r, "</td><td>",
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);
+ ap_rprintf(r, "</td><td>%d</td>", worker->s->lbfactor);
+ ap_rprintf(r, "<td>%d</td><td>", worker->s->lbset);
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>", worker->s->elected);
- ap_rprintf(r, "<td align='center'>%" APR_SIZE_T_FMT "</td>", worker->s->busy);
- ap_rprintf(r, "<td align='center'>%d</td><td align='center'>", worker->s->lbstatus);
+ ap_rprintf(r, "<td>%" APR_SIZE_T_FMT "</td>", worker->s->elected);
+ ap_rprintf(r, "<td>%" APR_SIZE_T_FMT "</td>", worker->s->busy);
+ ap_rprintf(r, "<td>%d</td><td>", worker->s->lbstatus);
ap_rputs(apr_strfsize(worker->s->transferred, fbuf), r);
- ap_rputs("</td><td align='center'>", r);
+ ap_rputs("</td><td>", r);
ap_rputs(apr_strfsize(worker->s->read, fbuf), r);
+ if (set_worker_hc_param_f) {
+ ap_rprintf(r, "</td><td>%s</td>", ap_proxy_show_hcmethod(worker->s->method));
+ ap_rprintf(r, "<td>%d</td>", (int)apr_time_sec(worker->s->interval));
+ ap_rprintf(r, "<td>%d (%d)</td>", worker->s->passes,worker->s->pcount);
+ ap_rprintf(r, "<td>%d (%d)</td>", worker->s->fails, worker->s->fcount);
+ ap_rprintf(r, "<td>%s", worker->s->hcuri);
+ }
ap_rputs("</td></tr>\n", r);
++workers;
ap_rputs("<hr />\n", r);
if (wsel && bsel) {
ap_rputs("<h3>Edit worker settings for ", r);
- ap_rvputs(r, wsel->s->name, "</h3>\n", NULL);
- ap_rputs("<form method='POST' enctype='application/x-www-form-urlencoded' action='", r);
- ap_rvputs(r, action, "'>\n", NULL);
- ap_rputs("<dl>\n<table><tr><td>Load factor:</td><td><input name='w_lf' id='w_lf' type=text ", r);
+ ap_rvputs(r, (*wsel->s->uds_path?"<i>":""), ap_proxy_worker_name(r->pool, wsel), (*wsel->s->uds_path?"</i>":""), "</h3>\n", NULL);
+ ap_rputs("<form method=\"POST\" enctype=\"application/x-www-form-urlencoded\" action=\"", r);
+ ap_rvputs(r, ap_escape_uri(r->pool, action), "\">\n", NULL);
+ ap_rputs("<table><tr><td>Load factor:</td><td><input name='w_lf' id='w_lf' type=text ", r);
ap_rprintf(r, "value='%d'></td></tr>\n", wsel->s->lbfactor);
ap_rputs("<tr><td>LB Set:</td><td><input name='w_ls' id='w_ls' type=text ", r);
ap_rprintf(r, "value='%d'></td></tr>\n", wsel->s->lbset);
ap_rputs("<tr><td>Route:</td><td><input name='w_wr' id='w_wr' type=text ", r);
- ap_rvputs(r, "value='", ap_escape_html(r->pool, wsel->s->route),
+ ap_rvputs(r, "value=\"", ap_escape_html(r->pool, wsel->s->route),
NULL);
- ap_rputs("'></td></tr>\n", r);
+ ap_rputs("\"></td></tr>\n", r);
ap_rputs("<tr><td>Route Redirect:</td><td><input name='w_rr' id='w_rr' type=text ", r);
- ap_rvputs(r, "value='", ap_escape_html(r->pool, wsel->s->redirect),
+ ap_rvputs(r, "value=\"", ap_escape_html(r->pool, wsel->s->redirect),
NULL);
- ap_rputs("'></td></tr>\n", r);
+ ap_rputs("\"></td></tr>\n", r);
ap_rputs("<tr><td>Status:</td>", r);
- ap_rputs("<td><table border='1'><tr><th>Ign</th><th>Drn</th><th>Dis</th><th>Stby</th></tr>\n<tr>", r);
+ ap_rputs("<td><table><tr>"
+ "<th>Ignore Errors</th>"
+ "<th>Draining Mode</th>"
+ "<th>Disabled</th>"
+ "<th>Hot Standby</th></tr>\n<tr>", r);
create_radio("w_status_I", (PROXY_WORKER_IGNORE_ERRORS & wsel->s->status), r);
create_radio("w_status_N", (PROXY_WORKER_DRAIN & wsel->s->status), r);
create_radio("w_status_D", (PROXY_WORKER_DISABLED & wsel->s->status), r);
ap_rvputs(r, "</table>\n<input type=hidden name='w' id='w' ", NULL);
ap_rvputs(r, "value='", ap_escape_uri(r->pool, wsel->s->name), "'>\n", NULL);
ap_rvputs(r, "<input type=hidden name='b' id='b' ", NULL);
- ap_rvputs(r, "value='", bsel->name + sizeof(BALANCER_PREFIX) - 1,
+ ap_rvputs(r, "value='", bsel->s->name + sizeof(BALANCER_PREFIX) - 1,
"'>\n", NULL);
ap_rvputs(r, "<input type=hidden name='nonce' id='nonce' value='",
bsel->s->nonce, "'>\n", NULL);
- ap_rvputs(r, "</form>\n", NULL);
+ ap_rputs("</form>\n", r);
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, bsel->s->name, "</h3>\n", NULL);
ap_rputs("<form method='POST' enctype='application/x-www-form-urlencoded' action='", r);
- ap_rvputs(r, action, "'>\n", NULL);
- ap_rputs("<dl>\n<table>\n", r);
+ ap_rvputs(r, ap_escape_uri(r->pool, action), "'>\n", NULL);
+ ap_rputs("<table>\n", r);
provs = ap_list_provider_names(r->pool, PROXY_LBMETHOD, "0");
if (provs) {
ap_rputs("<tr><td>LBmethod:</td>", r);
ap_rvputs(r, "value ='", bsel->s->sticky, NULL);
}
ap_rputs("'> (Use '-' to delete)</td></tr>\n", r);
- if (storage->num_free_slots(bsel->slot) != 0) {
+ if (storage->num_free_slots(bsel->wslot) != 0) {
ap_rputs("<tr><td>Add New Worker:</td><td><input name='b_nwrkr' id='b_nwrkr' size=32 type=text>"
" Are you sure? <input name='b_wyes' id='b_wyes' type=checkbox value='1'>"
"</td></tr>", 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' id='b' ", NULL);
- ap_rvputs(r, "value='", bsel->name + sizeof(BALANCER_PREFIX) - 1,
+ ap_rvputs(r, "value='", bsel->s->name + sizeof(BALANCER_PREFIX) - 1,
"'>\n", NULL);
ap_rvputs(r, "<input type=hidden name='nonce' id='nonce' value='",
bsel->s->nonce, "'>\n", NULL);
- ap_rvputs(r, "</form>\n", NULL);
+ ap_rputs("</form>\n", r);
ap_rputs("<hr />\n", r);
}
ap_rputs(ap_psignature("",r), r);
if (conf->balancers->nelts) {
apr_size_t size;
unsigned int num;
- 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");
+ storage->attach(&(conf->bslot), conf->id, &size, &num, p);
+ if (!conf->bslot) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01205) "slotmem_attach failed");
exit(1); /* Ugly, but what else? */
}
}
rv = ap_proxy_initialize_balancer(balancer, s, p);
if (rv != APR_SUCCESS) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
+ ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, APLOGNO(01206)
"Failed to init balancer %s in child",
- balancer->name);
+ balancer->s->name);
exit(1); /* Ugly, but what else? */
}
init_balancer_members(conf->pool, s, balancer);
* initializes
*/
static const char *const aszPred[] = { "mpm_winnt.c", "mod_slotmem_shm.c", NULL};
+ static const char *const aszPred2[] = { "mod_proxy.c", NULL};
/* manager handler */
- ap_hook_post_config(balancer_post_config, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_post_config(balancer_post_config, aszPred2, NULL, APR_HOOK_MIDDLE);
ap_hook_pre_config(balancer_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_handler(balancer_handler, NULL, NULL, APR_HOOK_FIRST);
ap_hook_child_init(balancer_child_init, aszPred, NULL, APR_HOOK_MIDDLE);
projects / apache / blobdiff