Mercurial > hg > nginx-quic
changeset 6108:55dc5f7eb921
Upstream: get rid of questionable micro-optimization in ip_hash.
If a peer was initially skipped due to max_fails, there's no reason
not to try it again if enough time has passed, and the next_upstream
logic is in action.
This also reduces diffs with NGINX Plus.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Thu, 16 Apr 2015 20:09:11 +0300 |
parents | cb790d1b2d16 |
children | d588dda5ec31 |
files | src/http/modules/ngx_http_upstream_ip_hash_module.c |
diffstat | 1 files changed, 2 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_upstream_ip_hash_module.c +++ b/src/http/modules/ngx_http_upstream_ip_hash_module.c @@ -216,23 +216,18 @@ ngx_http_upstream_get_ip_hash_peer(ngx_p "get ip hash peer, hash: %ui %04XA", p, m); if (peer->down) { - goto next_try; + goto next; } if (peer->max_fails && peer->fails >= peer->max_fails && now - peer->checked <= peer->fail_timeout) { - goto next_try; + goto next; } break; - next_try: - - iphp->rrp.tried[n] |= m; - pc->tries--; - next: if (++iphp->tries > 20) {