Mercurial > hg > nginx-quic
diff src/http/modules/ngx_http_upstream_least_conn_module.c @ 5274:f06bbc08e457 stable-1.4
Upstream: fixed fail_timeout and max_fails > 1.
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
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 21 May 2013 21:47:50 +0400 |
parents | 5373be93c0be |
children | 575175ebf4b4 |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_upstream_least_conn_module.c +++ b/src/http/modules/ngx_http_upstream_least_conn_module.c @@ -282,7 +282,10 @@ ngx_http_upstream_get_least_conn_peer(ng } 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;