Add few extra WANT_QUERYTRACE logs into resume_qmin

Print optionally a bit more details not passed to event in case
dns_view_findzonecut returns unexpected result. Result would be
visible later in foundevent, but found fname would be lost. Print it
into the log.

(cherry picked from commit d2c6966232)
This commit is contained in:
Petr Menšík 2025-06-10 14:35:03 +02:00 committed by Mark Andrews
parent 5fa9008a2d
commit c2f37f5da4

View file

@ -107,6 +107,14 @@
DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(3), \
"fctx %p(%s): %s %s%u", fctx, fctx->info, (m1), (m2), \
(v))
#define FCTXTRACEN(m1, name, res) \
do { \
if (isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(3))) { \
char dbuf[DNS_NAME_FORMATSIZE]; \
dns_name_format((name), dbuf, sizeof(dbuf)); \
FCTXTRACE4((m1), dbuf, (res)); \
} \
} while (0)
#define FTRACE(m) \
isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER, \
DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(3), \
@ -158,6 +166,7 @@
UNUSED(m2); \
UNUSED(v); \
} while (0)
#define FCTXTRACEN(m1, name, res) FCTXTRACE4(m1, name, res)
#define FTRACE(m) \
do { \
UNUSED(m); \
@ -4265,6 +4274,7 @@ resume_qmin(void *arg) {
result = dns_view_findzonecut(res->view, fctx->name, fname, dcname,
fctx->now, findoptions, true, true,
&fctx->nameservers, NULL);
FCTXTRACEN("resume_qmin findzonecut", fname, result);
/*
* DNS_R_NXDOMAIN here means we have not loaded the root zone
@ -5010,6 +5020,8 @@ clone_results(fetchctx_t *fctx) {
/* This is the head resp; keep a pointer and move on */
if (hresp == NULL) {
hresp = ISC_LIST_HEAD(fctx->resps);
FCTXTRACEN("clone_results", hresp->foundname,
hresp->result);
continue;
}