Remove origin_tries limiter on forwarding

This limit seems to have been set to prevent large amount of looping when
DIRECT attempts fail under the old model of constant DNS lookups and
retries.

However it is hard-coded and has no configuration knob visible. Under
the curent model of all destinations being enumerated once and tried
sequentially this protection would seem to be no longer necessary and
somewhat harmful as it will be preventing retries reaching destinations
with more than 2 unreachable IPs (think 3 IPv6 and an IPv4 on IPv4-only
network).

diff --git a/src/forward.cc b/src/forward.cc
index 5d29528a6e2e506717c5a1325378441656e61e22..d1e05a4e01408846c518fb61dc8edef56ba8a4de 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -548,9 +548,6 @@ FwdState::checkRetry()
     if (n_tries > 10)
         return false;
 
-    if (origin_tries > 2)
-        return false;
-
     if (squid_curtime - start_t > Config.Timeout.forward)
         return false;
 
@@ -1023,9 +1020,6 @@ FwdState::connectStart()
         debugs(17, 3, HERE << "reusing pconn " << serverConnection());
         ++n_tries;
 
-        if (!serverConnection()->getPeer())
-            ++origin_tries;
-
         comm_add_close_handler(serverConnection()->fd, fwdServerClosedWrapper, this);
 
         /* Update server side TOS and Netfilter mark on the connection. */
@@ -1225,9 +1219,6 @@ FwdState::reforward()
     if (n_tries > Config.forward_max_tries)
         return 0;
 
-    if (origin_tries > 1)
-        return 0;
-
     if (request->bodyNibbled())
         return 0;
 

diff --git a/src/forward.h b/src/forward.h
index da3e74a427af5c3baa005ad6350d9478bf2f072b..5798fcad831998bc1e6af0928542af93c7a26460 100644 (file)
--- a/src/forward.h
+++ b/src/forward.h
@@ -99,7 +99,6 @@ private:
     Comm::ConnectionPointer clientConn;        ///< a possibly open connection to the client.
     time_t start_t;
     int n_tries;
-    int origin_tries;
 
     // AsyncCalls which we set and may need cancelling.
     struct {