From a74e60a325f33ae6cd48e74a820b6405e77c9406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Wed, 16 Feb 2022 13:26:12 +0100 Subject: [PATCH 1/2] Log the result of each resolver priming attempt When a resolver priming attempt completes, the following message is currently logged: resolver priming query complete This message is identical for both successful and failed priming attempts. Consider the following log excerpts: - successful priming attempt: 10-Feb-2022 11:33:11.272 all zones loaded 10-Feb-2022 11:33:11.272 running 10-Feb-2022 11:33:19.722 resolver priming query complete - failed priming attempt: 10-Feb-2022 11:33:29.978 all zones loaded 10-Feb-2022 11:33:29.978 running 10-Feb-2022 11:33:38.432 timed out resolving '_.org/A/IN': 2001:500:9f::42#53 10-Feb-2022 11:33:38.522 timed out resolving './NS/IN': 2001:500:9f::42#53 10-Feb-2022 11:33:42.132 timed out resolving '_.org/A/IN': 2001:500:12::d0d#53 10-Feb-2022 11:33:42.285 timed out resolving './NS/IN': 2001:500:12::d0d#53 10-Feb-2022 11:33:44.685 resolver priming query complete Include the result of each priming attempt in the relevant log message to give the administrator better insight into named's resolver priming process. (cherry picked from commit f286c845b03269443c3d395e6384858985127846) --- lib/dns/resolver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 0b5633f9fd..b558485157 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -10231,7 +10231,8 @@ prime_done(isc_task_t *task, isc_event_t *event) { isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER, DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO, - "resolver priming query complete"); + "resolver priming query complete: %s", + isc_result_totext(fevent->result)); UNUSED(task); From 899e5a7e3f009439a5722599ea39ee96e9921c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Wed, 16 Feb 2022 13:26:12 +0100 Subject: [PATCH 2/2] Add CHANGES entry for [GL #3139] (cherry picked from commit 39df399d9f07541cf967d4abeac29da346260332) --- CHANGES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index 9ea6f59dee..caa56b09c9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +5805. [func] The result of each resolver priming attempt is now + included in the "resolver priming query complete" log + message. [GL #3139] + 5804. [func] Add a debug log message when starting and ending the task exclusive mode. [GL #3137]