From 621c117101c36ed3781431270e6c6dfc4364420b Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 20 Jul 2023 09:16:03 +1000 Subject: [PATCH 1/2] Mark a primary as unreachable on timed out in xfin When a primary server is not responding, mark it as temporarialy unreachable. This will prevent too many zones queuing up on a unreachable server and allow the refresh process to move onto the next primary sooner once it has been so marked. --- lib/dns/xfrin.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c index bf3460169a..b144c46663 100644 --- a/lib/dns/xfrin.c +++ b/lib/dns/xfrin.c @@ -1057,9 +1057,11 @@ failure: case ISC_R_NETUNREACH: case ISC_R_HOSTUNREACH: case ISC_R_CONNREFUSED: + case ISC_R_TIMEDOUT: /* - * Add the server to unreachable primaries table only if - * the server has a permanent networking error. + * Add the server to unreachable primaries table if + * the server has a permanent networking error or + * the connection attempt as timed out. */ zmgr = dns_zone_getmgr(xfr->zone); if (zmgr != NULL) { From fefc273eb00bb210c682c7c54d12b4a5e5a8bfa7 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 20 Jul 2023 09:18:54 +1000 Subject: [PATCH 2/2] Add CHANGES note for [GL #4215] --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index bd9b01a1fa..fb6684b136 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +6213. [bug] Mark a primary server as temporarily unreachable if the + TCP connection attempt times out. [GL #4215] + 6212. [placeholder] 6211. [func] Remove 'auto-dnssec'. This obsoletes the configuration