IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upstream: included backup peers into peer.tries.

Browse Source 
Since peer.tries is never reset it can now be limited if required.
This commit is contained in:
Roman Arutyunyan 2014-09-12 18:50:46 +04:00
parent 4c7e1a8d85
commit cfc3db1972
2 changed files with 6 additions and 12 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

@ -299,10 +299,6 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data)
lcp->rrp.tried[n] |= m; lcp->rrp.tried[n] |= m;
lcp->conns[p]++; lcp->conns[p]++;
if (pc->tries == 1 && peers->next) {
pc->tries += peers->next->number;
}
return NGX_OK; return NGX_OK;
failed: failed:
@ -314,7 +310,6 @@ failed:
lcp->conns += peers->number; lcp->conns += peers->number;
lcp->rrp.peers = peers->next; lcp->rrp.peers = peers->next;
pc->tries = lcp->rrp.peers->number;
n = (lcp->rrp.peers->number + (8 * sizeof(uintptr_t) - 1)) n = (lcp->rrp.peers->number + (8 * sizeof(uintptr_t) - 1))
/ (8 * sizeof(uintptr_t)); / (8 * sizeof(uintptr_t));

13
src/http/ngx_http_upstream_round_robin.c
View File

@ -10,6 +10,10 @@
#include <ngx_http.h> #include <ngx_http.h>
#define ngx_http_upstream_tries(p) ((p)->number \
+ ((p)->next ? (p)->next->number : 0))
static ngx_http_upstream_rr_peer_t *ngx_http_upstream_get_peer( static ngx_http_upstream_rr_peer_t *ngx_http_upstream_get_peer(
ngx_http_upstream_rr_peer_data_t *rrp); ngx_http_upstream_rr_peer_data_t *rrp);
@ -255,7 +259,7 @@ ngx_http_upstream_init_round_robin_peer(ngx_http_request_t *r,
r->upstream->peer.get = ngx_http_upstream_get_round_robin_peer; r->upstream->peer.get = ngx_http_upstream_get_round_robin_peer;
r->upstream->peer.free = ngx_http_upstream_free_round_robin_peer; r->upstream->peer.free = ngx_http_upstream_free_round_robin_peer;
r->upstream->peer.tries = rrp->peers->number; r->upstream->peer.tries = ngx_http_upstream_tries(rrp->peers);
#if (NGX_HTTP_SSL) #if (NGX_HTTP_SSL)
r->upstream->peer.set_session = r->upstream->peer.set_session =
ngx_http_upstream_set_round_robin_peer_session; ngx_http_upstream_set_round_robin_peer_session;
@ -374,7 +378,7 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r,
r->upstream->peer.get = ngx_http_upstream_get_round_robin_peer; r->upstream->peer.get = ngx_http_upstream_get_round_robin_peer;
r->upstream->peer.free = ngx_http_upstream_free_round_robin_peer; r->upstream->peer.free = ngx_http_upstream_free_round_robin_peer;
r->upstream->peer.tries = rrp->peers->number; r->upstream->peer.tries = ngx_http_upstream_tries(rrp->peers);
#if (NGX_HTTP_SSL) #if (NGX_HTTP_SSL)
r->upstream->peer.set_session = ngx_http_upstream_empty_set_session; r->upstream->peer.set_session = ngx_http_upstream_empty_set_session;
r->upstream->peer.save_session = ngx_http_upstream_empty_save_session; r->upstream->peer.save_session = ngx_http_upstream_empty_save_session;
@ -432,10 +436,6 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
/* ngx_unlock_mutex(peers->mutex); */ /* ngx_unlock_mutex(peers->mutex); */
if (pc->tries == 1 && peers->next) {
pc->tries += peers->next->number;
}
return NGX_OK; return NGX_OK;
failed: failed:
@ -447,7 +447,6 @@ failed:
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0, "backup servers"); ngx_log_debug0(NGX_LOG_DEBUG_HTTP, pc->log, 0, "backup servers");
rrp->peers = peers->next; rrp->peers = peers->next;
pc->tries = rrp->peers->number;
n = (rrp->peers->number + (8 * sizeof(uintptr_t) - 1)) n = (rrp->peers->number + (8 * sizeof(uintptr_t) - 1))
/ (8 * sizeof(uintptr_t)); / (8 * sizeof(uintptr_t));