Mercurial > hg > nginx

diff src/http/modules/ngx_http_upstream_least_conn_module.c @ 5831:575175ebf4b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: included backup peers into peer.tries. Since peer.tries is never reset it can now be limited if required.
author Roman Arutyunyan <arut@nginx.com>
date Fri, 12 Sep 2014 18:50:46 +0400
parents 1d68b502088c
children 6ff0ebd6fbf4
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
@@ -299,10 +299,6 @@ ngx_http_upstream_get_least_conn_peer(ng
     lcp->rrp.tried[n] |= m;
     lcp->conns[p]++;
 
-    if (pc->tries == 1 && peers->next) {
-        pc->tries += peers->next->number;
-    }
-
     return NGX_OK;
 
 failed:
@@ -314,7 +310,6 @@ failed:
         lcp->conns += peers->number;
 
         lcp->rrp.peers = peers->next;
-        pc->tries = lcp->rrp.peers->number;
 
         n = (lcp->rrp.peers->number + (8 * sizeof(uintptr_t) - 1))
                 / (8 * sizeof(uintptr_t));