IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-01-22 06:13:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upstream: fixed fail_timeout and max_fails > 1.

Browse Source 
Due to peer->checked always set since rev. c90801720a0c (1.3.0)
by round-robin and least_conn balancers (ip_hash not affected),
the code in ngx_http_upstream_free_round_robin_peer() function
incorrectly reset peer->fails too often.

Reported by Dmitry Popov,
http://mailman.nginx.org/pipermail/nginx-devel/2013-May/003720.html
This commit is contained in:
Maxim Dounin 2013-05-21 21:47:50 +04:00
parent 2b1779b916
commit a1ab0dde4a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/http/modules/ngx_http_upstream_least_conn_module.c
View File

@ -282,7 +282,10 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
}
best->current_weight -= total;
best->checked = now;
if (now - best->checked > best->fail_timeout) {
best->checked = now;
}
pc->sockaddr = best->sockaddr;
pc->socklen = best->socklen;

5
src/http/ngx_http_upstream_round_robin.c
View File

@ -523,7 +523,10 @@ ngx_http_upstream_get_peer(ngx_http_upstream_rr_peer_data_t *rrp)
rrp->tried[n] |= m;
best->current_weight -= total;
best->checked = now;
if (now - best->checked > best->fail_timeout) {
best->checked = now;
}
return best;
}