Skip to content

[MODCLUSTER-408] Requests are not properly drained during undeploy #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 13, 2014
Merged

[MODCLUSTER-408] Requests are not properly drained during undeploy #81

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0c2553
[MODCLUSTER-408] Requests are not properly drained during undeploy
aogburn May 19, 2014
13f0df7
[MODCLUSTER-408] set BALANCER_CONTEXT_ID for all find_route_worker re…
aogburn Jun 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 29 additions & 7 deletions native/mod_proxy_cluster/mod_proxy_cluster.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3085,6 +3085,7 @@ static proxy_worker *find_route_worker(request_rec *r,
int sizew = balancer->workers->elt_size;

proxy_worker *worker;
node_context *nodecontext;

checking_standby = checked_standby = 0;
while (!checked_standby) {
Expand Down Expand Up @@ -3118,10 +3119,12 @@ static proxy_worker *find_route_worker(request_rec *r,
nodeinfo_t *node;
if (node_storage->read_node(index, &node) != APR_SUCCESS)
return NULL; /* can't read node */
if (context_host_ok(r, balancer, index, vhost_table, context_table, node_table) != NULL)
return worker;
else
return NULL; /* application has been removed from the node */
if ((nodecontext = context_host_ok(r, balancer, index, vhost_table, context_table, node_table)) != NULL) {
apr_table_setn(r->subprocess_env, "BALANCER_CONTEXT_ID", apr_psprintf(r->pool, "%d", (*nodecontext).context));
return worker;
} else {
return NULL; /* application has been removed from the node */
}
} else {
/*
* If the worker is in error state run
Expand All @@ -3136,7 +3139,16 @@ static proxy_worker *find_route_worker(request_rec *r,
ap_proxy_retry_worker("BALANCER", worker, r->server);
#endif
if (PROXY_WORKER_IS_USABLE(worker)) {
return worker;
/* The context may not be available */
nodeinfo_t *node;
if (node_storage->read_node(index, &node) != APR_SUCCESS)
return NULL; /* can't read node */
if ((nodecontext = context_host_ok(r, balancer, index, vhost_table, context_table, node_table)) != NULL) {
apr_table_setn(r->subprocess_env, "BALANCER_CONTEXT_ID", apr_psprintf(r->pool, "%d", (*nodecontext).context));
return worker;
} else {
return NULL; /* application has been removed from the node */
}
} else {
/*
* We have a worker that is unusable.
Expand Down Expand Up @@ -3165,8 +3177,18 @@ static proxy_worker *find_route_worker(request_rec *r,
ap_proxy_retry_worker("BALANCER", rworker, r->server);
#endif
}
if (rworker && PROXY_WORKER_IS_USABLE(rworker))
return rworker;
if (rworker && PROXY_WORKER_IS_USABLE(rworker)) {
/* The context may not be available */
nodeinfo_t *node;
if (node_storage->read_node(index, &node) != APR_SUCCESS)
return NULL; /* can't read node */
if ((nodecontext = context_host_ok(r, balancer, index, vhost_table, context_table, node_table)) != NULL) {
apr_table_setn(r->subprocess_env, "BALANCER_CONTEXT_ID", apr_psprintf(r->pool, "%d", (*nodecontext).context));
return rworker;
} else {
return NULL; /* application has been removed from the node */
}
}
}
}
}
Expand Down