CERBERUS/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-09-01 19:10:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Upstream: fixed ip_hash rebalancing with the "down" flag.

Browse source 
Due to weight being set to 0 for down peers, order of peers after sorting
wasn't the same as without the "down" flag (with down peers at the end),
resulting in client rebalancing for clients on other servers.  The only
rebalancing which should happen after adding "down" to a server is one
for clients on the server.

The problem was introduced in r1377 (which fixed endless loop by setting
weight to 0 for down servers).  The loop is no longer possible with new
smooth algorithm, so preserving original weight is safe.
This commit is contained in:
Maxim Dounin 2012-05-14 09:58:07 +00:00
parent 52327e0627
commit 4d5759e098
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/http/ngx_http_upstream_round_robin.c
View file

@ -80,8 +80,8 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
peers->peer[n].max_fails = server[i].max_fails;
peers->peer[n].fail_timeout = server[i].fail_timeout;
peers->peer[n].down = server[i].down;
peers->peer[n].weight = server[i].down ? 0 : server[i].weight;
peers->peer[n].effective_weight = peers->peer[n].weight;
peers->peer[n].weight = server[i].weight;
peers->peer[n].effective_weight = server[i].weight;
peers->peer[n].current_weight = 0;
n++;
}