Skip to content

MODCLUSTER-590 - workers array for Deterministic failover is allo… #14

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 1 commit into from
Jun 16, 2017
Merged

MODCLUSTER-590 - workers array for Deterministic failover is allo… #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 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 @@ -2200,7 +2200,7 @@ static proxy_worker *internal_find_best_byrequests(proxy_balancer *balancer, pro
int checked_standby = 0;
int checked_domain = 1;
// Create a separate array of available workers, to be sorted later
proxy_worker *workers[balancer->workers->nelts];
proxy_worker *workers = apr_pcalloc(balancer->workers->pool, sizeof(proxy_worker) * balancer->workers->nelts);
int workers_length = 0;
const char *session_id_with_route;
char *tokenizer;
Expand Down Expand Up @@ -2289,7 +2289,7 @@ static proxy_worker *internal_find_best_byrequests(proxy_balancer *balancer, pro
continue;
}
}
workers[workers_length++] = worker;
workers[workers_length++] = *worker;
if (worker->s->lbfactor == 0 && checking_standby) {
mycandidate = worker;
mynodecontext = nodecontext;
Expand Down Expand Up @@ -2332,7 +2332,7 @@ static proxy_worker *internal_find_best_byrequests(proxy_balancer *balancer, pro
for (i = 0; session_id[i] != 0; ++i) {
hash += session_id[i];
}
mycandidate = workers[hash % workers_length];
mycandidate = &workers[hash % workers_length];
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "Using deterministic failover target: %s", mycandidate->s->route);
}
if (mycandidate)
Expand Down