mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-22 10:10:06 +00:00
Code Issues Releases Wiki Activity

fix:usr: Dump the active resolver fetches from dns_resolver_dumpfetches()

Browse Source 
Previously, active resolver fetches were only dumped when the `fetches-per-zone` configuration option was enabled. Now, active resolver fetches are dumped along with the number of `clients-per-server` counters per resolver fetch.

Merge branch 'ondrej/make-dns_resolver_dumpfetches-dump-fetches' into 'main'

See merge request isc-projects/bind9!10107
This commit is contained in:
Ondřej Surý 2025-02-21 21:26:18 +00:00
commit 5d0c347e75
1 changed files with 61 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
lib/dns/resolver.c
View File

@ -16,6 +16,7 @@
#include <ctype.h> #include <ctype.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h>
#include <isc/ascii.h> #include <isc/ascii.h>
#include <isc/async.h> #include <isc/async.h>
@ -352,6 +353,8 @@ struct fetchctx {
fetchstate_t state; fetchstate_t state;
bool cloned; bool cloned;
bool spilled; bool spilled;
uint_fast32_t allowed;
uint_fast32_t dropped;
ISC_LIST(dns_fetchresponse_t) resps; ISC_LIST(dns_fetchresponse_t) resps;
/*% Locked by loop event serialization. */ /*% Locked by loop event serialization. */
@ -10541,6 +10544,7 @@ dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name,
} }
if (fctx->spilled) { if (fctx->spilled) {
inc_stats(res, dns_resstatscounter_clientquota); inc_stats(res, dns_resstatscounter_clientquota);
fctx->dropped++;
result = DNS_R_DROP; result = DNS_R_DROP;
goto unlock; goto unlock;
} }
@ -10560,6 +10564,8 @@ dns_resolver_createfetch(dns_resolver_t *res, const dns_name_t *name,
fctx->depth = depth; fctx->depth = depth;
} }
fctx->allowed++;
fctx_join(fctx, loop, client, id, cb, arg, edectx, rdataset, fctx_join(fctx, loop, client, id, cb, arg, edectx, rdataset,
sigrdataset, fetch); sigrdataset, fetch);
@ -10927,22 +10933,68 @@ dns_resolver_dumpfetches(dns_resolver_t *res, isc_statsformat_t format,
REQUIRE(fp != NULL); REQUIRE(fp != NULL);
REQUIRE(format == isc_statsformat_file); REQUIRE(format == isc_statsformat_file);
RWLOCK(&res->counters_lock, isc_rwlocktype_read); LOCK(&res->lock);
isc_hashmap_iter_create(res->counters, &it); fprintf(fp, "clients-per-query: %u/%u/%u\n", res->spillatmin,
res->spillat, res->spillatmax);
UNLOCK(&res->lock);
RWLOCK(&res->fctxs_lock, isc_rwlocktype_read);
isc_hashmap_iter_create(res->fctxs, &it);
for (result = isc_hashmap_iter_first(it); result == ISC_R_SUCCESS; for (result = isc_hashmap_iter_first(it); result == ISC_R_SUCCESS;
result = isc_hashmap_iter_next(it)) result = isc_hashmap_iter_next(it))
{ {
fctxcount_t *counter = NULL; char typebuf[DNS_RDATATYPE_FORMATSIZE];
isc_hashmap_iter_current(it, (void **)&counter); char timebuf[1024];
fetchctx_t *fctx = NULL;
dns_fetchresponse_t *resp = NULL;
resquery_t *query = NULL;
unsigned int resp_count = 0, query_count = 0;
isc_hashmap_iter_current(it, (void **)&fctx);
LOCK(&fctx->lock);
dns_name_print(fctx->name, fp);
isc_time_formatISO8601ms(&fctx->start, timebuf,
sizeof(timebuf));
dns_rdatatype_format(fctx->type, typebuf, sizeof(typebuf));
fprintf(fp, "/%s (%s): started %s, ", typebuf,
fctx->state == fetchstate_active ? "active" : "done",
timebuf);
for (resp = ISC_LIST_HEAD(fctx->resps); resp != NULL;
resp = ISC_LIST_NEXT(resp, link))
{
resp_count++;
}
for (query = ISC_LIST_HEAD(fctx->queries); query != NULL;
query = ISC_LIST_NEXT(query, link))
{
query_count++;
}
if (isc_timer_running(fctx->timer)) {
strlcpy(timebuf, "expires ", sizeof(timebuf));
isc_time_formatISO8601ms(&fctx->expires, timebuf + 8,
sizeof(timebuf) - 8);
} else {
strlcpy(timebuf, "not running", sizeof(timebuf));
}
dns_name_print(counter->domain, fp);
fprintf(fp, fprintf(fp,
": %" PRIuFAST32 " active (%" PRIuFAST32 "fetches: %u active (%" PRIuFAST32
" spilled, %" PRIuFAST32 " allowed)\n", " allowed, %" PRIuFAST32
counter->count, counter->dropped, counter->allowed); " dropped%s), queries: %u, timer %s\n",
resp_count, fctx->allowed, fctx->dropped,
fctx->spilled ? ", spilled" : "", query_count, timebuf);
UNLOCK(&fctx->lock);
} }
RWUNLOCK(&res->counters_lock, isc_rwlocktype_read);
isc_hashmap_iter_destroy(&it); isc_hashmap_iter_destroy(&it);
RWUNLOCK(&res->fctxs_lock, isc_rwlocktype_read);
} }
isc_result_t isc_result_t