From: Ondřej Surý <ondrej@isc.org>
Date: Tue, 22 Jul 2025 18:39:00 +0000 (+0200)
Subject: Reword the 'shut down hung fetch while resolving' message
X-Git-Tag: v9.21.11~30^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=933dcc18ee9b62de2a15f2a768cde4f09095a4da;p=thirdparty%2Fbind9.git

Reword the 'shut down hung fetch while resolving' message

The log message 'shut down hung fetch while resolving' may be confusing
because no detection of hung fetches actually takes place, but rather
the timer on the fetch context expires and the resolver gives up.

Change the log message to actually say that instead of the original
cryptic message about hung fetch.
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index be506e505b9..f5a223e5987 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -4423,10 +4423,9 @@ fctx_expired(void *arg) {
 	REQUIRE(VALID_FCTX(fctx));
 	REQUIRE(fctx->tid == isc_tid());
 
+	FCTXTRACE(isc_result_totext(ISC_R_TIMEDOUT));
 	isc_log_write(DNS_LOGCATEGORY_RESOLVER, DNS_LOGMODULE_RESOLVER,
-		      ISC_LOG_INFO,
-		      "shut down hung fetch while resolving %p(%s)", fctx,
-		      fctx->info);
+		      ISC_LOG_INFO, "gave up on resolving '%s'", fctx->info);
 
 	dns_ede_add(&fctx->edectx, DNS_EDE_NOREACHABLEAUTH, NULL);