From: Gu Feng <flygoast@126.com>
Date: Mon, 27 Oct 2014 11:52:03 +0000 (+0800)
Subject: Upstream: limited next_upstream time and tries when resolving DNS.
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=726c5726fb0a58b9eb567d0a7f3e9b56339959e9;p=nginx.git

Upstream: limited next_upstream time and tries when resolving DNS.

When got multiple upstream IP addresses using DNS resolving, the number of
upstreams tries and the maxinum time spent for these tries were not affected.
This patch fixed it.
---

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index c5070a07e..3e8ce09e1 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -981,6 +981,14 @@ ngx_http_upstream_resolve_handler(ngx_resolver_ctx_t *ctx)
     ngx_resolve_name_done(ctx);
     ur->ctx = NULL;
 
+    u->peer.start_time = ngx_current_msec;
+
+    if (u->conf->next_upstream_tries
+        && u->peer.tries > u->conf->next_upstream_tries)
+    {
+        u->peer.tries = u->conf->next_upstream_tries;
+    }
+
     ngx_http_upstream_connect(r, u);
 
 failed: