From: Baptiste Assmann <bedis9@gmail.com>
Date: Thu, 7 Nov 2019 10:02:18 +0000 (+0100)
Subject: BUG: dns: timeout resolve not applied for valid resolutions
X-Git-Tag: v2.1-dev5~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f50e1ac4442be41ed8b9b7372310d1d068b85b33;p=thirdparty%2Fhaproxy.git

BUG: dns: timeout resolve not applied for valid resolutions

Documentation states that the interval between 2 DNS resolution is
driven by "timeout resolve <time>" directive.
From a code point of view, this was applied unless the latest status of
the resolution was VALID. In such case, "hold valid" was enforce.
This is a bug, because "hold" timers are not here to drive how often we
want to trigger a DNS resolution, but more how long we want to keep an
information if the status of the resolution itself as changed.
This avoid flapping and prevent shutting down an entire backend when a
DNS server is not answering.

This issue was reported by hamshiva in github issue #345.

Backport status: 1.8
---

diff --git a/src/dns.c b/src/dns.c
index 0001289606..5f9e7eae52 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -150,10 +150,7 @@ static inline uint16_t dns_rnd16(void)
 
 static inline int dns_resolution_timeout(struct dns_resolution *res)
 {
-	switch (res->status) {
-		case RSLV_STATUS_VALID: return res->resolvers->hold.valid;
-		default:                return res->resolvers->timeout.resolve;
-	}
+	return res->resolvers->timeout.resolve;
 }
 
 /* Updates a resolvers' task timeout for next wake up and queue it */