From 043df1be121f9fbc4741bd6612088ae678902d9a Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 2 May 2019 16:48:35 +1000 Subject: [PATCH 1/3] lower ixfr stop messages log level to debug(1) for poll style responses --- lib/ns/xfrout.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/ns/xfrout.c b/lib/ns/xfrout.c index 4092d13a5d..17cecc3118 100644 --- a/lib/ns/xfrout.c +++ b/lib/ns/xfrout.c @@ -685,6 +685,7 @@ typedef struct { bool many_answers; int sends; /* Send in progress */ bool shuttingdown; + bool poll; const char *mnemonic; /* Style of transfer */ struct xfr_stats stats; /*%< Transfer statistics */ } xfrout_ctx_t; @@ -1110,6 +1111,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { } else { keyname[0] = '\0'; } + xfr->poll = is_poll; if (is_poll) { xfrout_log1(client, question_name, question_class, ISC_LOG_DEBUG(1), "IXFR poll up to date%s%s", @@ -1239,6 +1241,7 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, unsigned int id, xfr->many_answers = many_answers; xfr->sends = 0; xfr->shuttingdown = false; + xfr->poll = false; xfr->mnemonic = NULL; xfr->buf.base = NULL; xfr->buf.length = 0; @@ -1709,7 +1712,7 @@ xfrout_senddone(isc_task_t *task, isc_event_t *event) { msecs = 1; } persec = (xfr->stats.nbytes * 1000) / msecs; - xfrout_log(xfr, ISC_LOG_INFO, + xfrout_log(xfr, xfr->poll ? ISC_LOG_DEBUG(1) : ISC_LOG_INFO, "%s ended: " "%" PRIu64 " messages, %" PRIu64 " records, " "%" PRIu64 " bytes, " From 915af3c9507f852f60282157de05233dc6bb83c3 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 29 May 2019 16:50:44 +1000 Subject: [PATCH 2/3] change mnemonic for IXFR poll response --- lib/ns/xfrout.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/ns/xfrout.c b/lib/ns/xfrout.c index 17cecc3118..c515b40ba8 100644 --- a/lib/ns/xfrout.c +++ b/lib/ns/xfrout.c @@ -1113,6 +1113,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { } xfr->poll = is_poll; if (is_poll) { + xfr->mnemonic = "IXFR poll response"; xfrout_log1(client, question_name, question_class, ISC_LOG_DEBUG(1), "IXFR poll up to date%s%s", (xfr->tsigkey != NULL) ? ": TSIG " : "", keyname); From aca283919db27442a0c7697a9746012c4415f764 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Sat, 1 Jun 2019 00:44:21 -0700 Subject: [PATCH 3/3] CHANGES --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 7b3a0decaf..82248d8c13 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5245. [cleanup] Reduce logging level for IXFR up-to-date poll + responses. [GL #1009] + 5244. [placeholder] 5243. [bug] Fix a possible race between dispatcher and socket