40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From b6aeccf697729c4c721fc71da7063bb18a89c751 Mon Sep 17 00:00:00 2001
|
|
From: Aram Sargsyan <aram@isc.org>
|
|
Date: Tue, 18 Oct 2022 08:54:04 +0000
|
|
Subject: [PATCH] Fix ns_statscounter_recursclients counting bug
|
|
|
|
The incrementing and decrementing of 'ns_statscounter_recursclients'
|
|
were not properly balanced: for example, it would be incremented for
|
|
a prefetch query but not decremented if the query failed.
|
|
|
|
This commit ensures that the recursion quota and the recursive clients
|
|
counter are always in sync with each other.
|
|
|
|
Conflict: NA
|
|
Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/b6aeccf697729c4c721fc71da7063bb18a89c751
|
|
(cherry picked from commit 82991451b41793af201d070aba654c4ea89819cb)
|
|
---
|
|
lib/ns/client.c | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/lib/ns/client.c b/lib/ns/client.c
|
|
index 41d3fa0..dc8a10a 100644
|
|
--- a/lib/ns/client.c
|
|
+++ b/lib/ns/client.c
|
|
@@ -242,10 +242,8 @@ ns_client_endrequest(ns_client_t *client) {
|
|
*/
|
|
if (client->recursionquota != NULL) {
|
|
isc_quota_detach(&client->recursionquota);
|
|
- if (client->query.prefetch == NULL) {
|
|
- ns_stats_decrement(client->sctx->nsstats,
|
|
- ns_statscounter_recursclients);
|
|
- }
|
|
+ ns_stats_decrement(client->sctx->nsstats,
|
|
+ ns_statscounter_recursclients);
|
|
}
|
|
|
|
/*
|
|
--
|
|
2.33.0
|
|
|