From d96fca478a8cfc7ad044d7bae2186c1da01c6a8b Mon Sep 17 00:00:00 2001 From: Aram Sargsyan Date: Fri, 7 Jun 2024 16:19:40 +0000 Subject: [PATCH] Exempt prefetches from the fetches-per-zone quota Give prefetches a free pass through the quota so that the cache entry for a popular zone could be updated successfully even if the quota for it is already reached. (cherry picked from commit cada2de31f91d6b2c8986b8147c56cc5f355794f) --- lib/dns/resolver.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index dd944f8670..5936d16274 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -4667,13 +4667,18 @@ fctx_create(dns_resolver_t *res, isc_loop_t *loop, const dns_name_t *name, } /* - * Are there too many simultaneous queries for this domain? + * Exempt prefetch queries from the fetches-per-zone quota check */ - result = fcount_incr(fctx, false); - if (result != ISC_R_SUCCESS) { - result = fctx->res->quotaresp[dns_quotatype_zone]; - inc_stats(res, dns_resstatscounter_zonequota); - goto cleanup_nameservers; + if ((fctx->options & DNS_FETCHOPT_PREFETCH) == 0) { + /* + * Are there too many simultaneous queries for this domain? + */ + result = fcount_incr(fctx, false); + if (result != ISC_R_SUCCESS) { + result = fctx->res->quotaresp[dns_quotatype_zone]; + inc_stats(res, dns_resstatscounter_zonequota); + goto cleanup_nameservers; + } } log_ns_ttl(fctx, "fctx_create");