add debug logging when creating or attaching to a query counter

fctx_create() now logs at debug level 9 when the fctx attaches
to an existing counter or creates a new one.

(cherry picked from commit 825f3d68c5b041b53f13a8c5b4dc431ca9b5887f)
(cherry picked from commit 14bce7e27582f97d2e5be43a8e88df84e241c5cb)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index dc96bbf3f394fa0b09f6beffd3476bd4fd2cb05a..6606468f16edd74e5705641a9ab6af908ccc5c54 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -5151,17 +5151,6 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type,
        mctx = res->buckets[bucketnum].mctx;
        fctx = isc_mem_get(mctx, sizeof(*fctx));
 
-       fctx->qc = NULL;
-       if (qc != NULL) {
-               isc_counter_attach(qc, &fctx->qc);
-       } else {
-               result = isc_counter_create(res->mctx, res->maxqueries,
-                                           &fctx->qc);
-               if (result != ISC_R_SUCCESS) {
-                       goto cleanup_fetch;
-               }
-       }
-
        /*
         * Make fctx->info point to a copy of a formatted string
         * "name/type".
@@ -5205,6 +5194,26 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type,
        dns_rdataset_init(&fctx->qminrrset);
        dns_name_init(&fctx->qmindcname, NULL);
        isc_stdtime_get(&fctx->now);
+       fctx->qc = NULL;
+
+       if (qc != NULL) {
+               isc_counter_attach(qc, &fctx->qc);
+               isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
+                             DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(9),
+                             "fctx %p(%s): attached to counter %p (%d)", fctx,
+                             fctx->info, fctx->qc, isc_counter_used(fctx->qc));
+       } else {
+               result = isc_counter_create(res->mctx, res->maxqueries,
+                                           &fctx->qc);
+               if (result != ISC_R_SUCCESS) {
+                       goto cleanup_nameservers;
+               }
+               isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
+                             DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(9),
+                             "fctx %p(%s): created counter %p", fctx,
+                             fctx->info, fctx->qc);
+       }
+
        ISC_LIST_INIT(fctx->queries);
        ISC_LIST_INIT(fctx->finds);
        ISC_LIST_INIT(fctx->altfinds);
@@ -5310,7 +5319,7 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type,
                                                      findoptions, true, true,
                                                      &fctx->nameservers, NULL);
                        if (result != ISC_R_SUCCESS) {
-                               goto cleanup_nameservers;
+                               goto cleanup_counter;
                        }
 
                        dns_name_dup(fname, mctx, &fctx->domain);
@@ -5500,6 +5509,9 @@ cleanup_domain:
                dns_name_free(&fctx->qmindcname, mctx);
        }
 
+cleanup_counter:
+       isc_counter_detach(&fctx->qc);
+
 cleanup_nameservers:
        if (dns_rdataset_isassociated(&fctx->nameservers)) {
                dns_rdataset_disassociate(&fctx->nameservers);
@@ -5507,9 +5519,6 @@ cleanup_nameservers:
        dns_name_free(&fctx->name, mctx);
        dns_name_free(&fctx->qminname, mctx);
        isc_mem_free(mctx, fctx->info);
-       isc_counter_detach(&fctx->qc);
-
-cleanup_fetch:
        isc_mem_put(mctx, fctx, sizeof(*fctx));
 
        return (result);