1berry/nginx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upstream hash: reordered peer checks.

Browse Source 
This slightly reduces cost of selecting a peer if all or almost all peers
failed, see ticket #1030.  There should be no measureable difference with
other workloads.
This commit is contained in:
Maxim Dounin 2017-10-05 17:43:05 +03:00
parent a10ec2db91
commit 53d655f894
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/http/modules/ngx_http_upstream_hash_module.c
View File

@ -543,13 +543,6 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
continue; continue;
} }
if (peer->server.len != server->len
|| ngx_strncmp(peer->server.data, server->data, server->len)
!= 0)
{
continue;
}
if (peer->max_fails if (peer->max_fails
&& peer->fails >= peer->max_fails && peer->fails >= peer->max_fails
&& now - peer->checked <= peer->fail_timeout) && now - peer->checked <= peer->fail_timeout)
@ -561,6 +554,13 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
continue; continue;
} }
if (peer->server.len != server->len
|| ngx_strncmp(peer->server.data, server->data, server->len)
!= 0)
{
continue;
}
peer->current_weight += peer->effective_weight; peer->current_weight += peer->effective_weight;
total += peer->effective_weight; total += peer->effective_weight;

14
src/stream/ngx_stream_upstream_hash_module.c
View File

@ -544,13 +544,6 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
continue; continue;
} }
if (peer->server.len != server->len
|| ngx_strncmp(peer->server.data, server->data, server->len)
!= 0)
{
continue;
}
if (peer->max_fails if (peer->max_fails
&& peer->fails >= peer->max_fails && peer->fails >= peer->max_fails
&& now - peer->checked <= peer->fail_timeout) && now - peer->checked <= peer->fail_timeout)
@ -562,6 +555,13 @@ ngx_stream_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data)
continue; continue;
} }
if (peer->server.len != server->len
|| ngx_strncmp(peer->server.data, server->data, server->len)
!= 0)
{
continue;
}
peer->current_weight += peer->effective_weight; peer->current_weight += peer->effective_weight;
total += peer->effective_weight; total += peer->effective_weight;