mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2025-03-25 04:17:42 +00:00
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
This commit is contained in:
parent
7264dfe949
commit
f50e1ac444
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user