From 905d50cef98cd3e67dccb9d16a1bbf5a40fc4d79 Mon Sep 17 00:00:00 2001 From: Aram Sargsyan Date: Fri, 22 Jul 2022 08:01:17 +0000 Subject: [PATCH] Differentiate between initial and cumulative fetch limit logging Cumulative fetch limit logging happens on an event of a dropped fetch if 60 seconds have been passed since the previous log message. This change makes the log message different for the initial event and for the later cumulative events to provide more useful information to the system administrator. --- lib/dns/resolver.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 8001b649a9a..f153e54d4d3 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -1591,8 +1591,11 @@ fcount_logspill(fetchctx_t *fctx, fctxcount_t *counter, bool final) { isc_log_write(dns_lctx, DNS_LOGCATEGORY_SPILL, DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO, "too many simultaneous fetches for %s " - "(allowed %d spilled %d)", - dbuf, counter->allowed, counter->dropped); + "(allowed %d spilled %d; %s)", + dbuf, counter->allowed, counter->dropped, + counter->dropped == 1 ? "initial trigger event" + : "cumulative since " + "initial trigger event"); } else { isc_log_write(dns_lctx, DNS_LOGCATEGORY_SPILL, DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO, -- GitLab