From: Aram Sargsyan <aram@isc.org>
Date: Fri, 7 Jun 2024 16:24:00 +0000 (+0000)
Subject: Exempt prefetches from the fetches-per-server quota
X-Git-Tag: v9.21.1~12^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7e8b7cf63385bf642b003b09ca987ec3dc2f924;p=thirdparty%2Fbind9.git

Exempt prefetches from the fetches-per-server quota

Give prefetches a free pass through the quota so that the cache
entries for popular zones could be updated successfully even if the
quota for is already reached.
---

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 52568129f9d..6e63965982a 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -1478,7 +1478,9 @@ copy_namehook_lists(dns_adb_t *adb, dns_adbfind_t *find, dns_adbname_t *name) {
 			dns_adbaddrinfo_t *addrinfo = NULL;
 			entry = namehook->entry;
 
-			if (adbentry_overquota(entry)) {
+			if ((find->options & DNS_ADBFIND_QUOTAEXEMPT) == 0 &&
+			    adbentry_overquota(entry))
+			{
 				find->options |= DNS_ADBFIND_OVERQUOTA;
 				goto nextv4;
 			}
@@ -1500,7 +1502,9 @@ copy_namehook_lists(dns_adb_t *adb, dns_adbfind_t *find, dns_adbname_t *name) {
 			dns_adbaddrinfo_t *addrinfo = NULL;
 			entry = namehook->entry;
 
-			if (adbentry_overquota(entry)) {
+			if ((find->options & DNS_ADBFIND_QUOTAEXEMPT) == 0 &&
+			    adbentry_overquota(entry))
+			{
 				find->options |= DNS_ADBFIND_OVERQUOTA;
 				goto nextv6;
 			}
diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h
index cf725b62fc8..65acb09ccf3 100644
--- a/lib/dns/include/dns/adb.h
+++ b/lib/dns/include/dns/adb.h
@@ -179,6 +179,10 @@ struct dns_adbfind {
  *	This is useful for reestablishing glue that has expired.
  */
 #define DNS_ADBFIND_STARTATZONE 0x00000020
+/*%
+ *	Fetches will be exempted from the quota.
+ */
+#define DNS_ADBFIND_QUOTAEXEMPT 0x00000040
 /*%
  *      The server's fetch quota is exceeded; it will be treated as
  *      lame for this query.
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index b1c98f2faa8..6a96aae5d9a 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -3257,6 +3257,13 @@ findname(fetchctx_t *fctx, const dns_name_t *name, in_port_t port,
 		options |= DNS_ADBFIND_STARTATZONE;
 	}
 
+	/*
+	 * Exempt prefetches from ADB quota.
+	 */
+	if ((fctx->options & DNS_FETCHOPT_PREFETCH) != 0) {
+		options |= DNS_ADBFIND_QUOTAEXEMPT;
+	}
+
 	/*
 	 * See what we know about this address.
 	 */