mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream: get rid of questionable micro-optimization in ip_hash.

Browse Source 
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.
This commit is contained in:
Ruslan Ermilov 2015-04-16 20:09:11 +03:00
parent d72fe76bb1
commit 7c44e39220
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/http/modules/ngx_http_upstream_ip_hash_module.c
View File

@ -216,23 +216,18 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data)
"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) {