From: Ondřej Surý <ondrej@isc.org>
Date: Wed, 15 Jan 2025 12:02:20 +0000 (+0100)
Subject: Shutdown the fetch context after canceling the last fetch
X-Git-Tag: v9.21.5~41^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f945c8b67006a1e495373eacb917ec2c47200d6;p=thirdparty%2Fbind9.git

Shutdown the fetch context after canceling the last fetch

Currently, the fetch context will continue running even when the last
fetch (response) has been removed from the context, so named can process
and cache the answer.  This can lead to a situation where the number of
outgoing recursing clients exceeds the the configured number for
recursive-clients.

Be more stringent about the recursive-clients limit and shutdown the
fetch context immediately after the last fetch has been canceled from
that particular fetch context.
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index ce878f15f8f..746fe6d9473 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -10584,6 +10584,7 @@ fail:
 void
 dns_resolver_cancelfetch(dns_fetch_t *fetch) {
 	fetchctx_t *fctx = NULL;
+	bool last_fetch = false;
 
 	REQUIRE(DNS_FETCH_VALID(fetch));
 	fctx = fetch->private;
@@ -10614,11 +10615,15 @@ dns_resolver_cancelfetch(dns_fetch_t *fetch) {
 		}
 	}
 
-	/*
-	 * The fctx continues running even if no fetches remain;
-	 * the answer is still cached.
-	 */
+	if (ISC_LIST_EMPTY(fctx->resps)) {
+		last_fetch = true;
+	}
 	UNLOCK(&fctx->lock);
+
+	if (last_fetch) {
+		fetchctx_ref(fctx);
+		isc_async_run(fctx->loop, fctx_shutdown, fctx);
+	}
 }
 
 void