From 0f43b0ea6c6b100c11cf3924db8f95b74fcf4068 Mon Sep 17 00:00:00 2001 From: "W.C.A. Wijngaards" Date: Thu, 13 Nov 2025 15:45:27 +0100 Subject: [PATCH] Changelog note for #1375, and lock for lockchecks and ifdef for compile fix. - Merge #1375: Copy DNSTAP changes from daemon to workers after fast_reload. --- daemon/remote.c | 4 ++++ doc/Changelog | 2 ++ 2 files changed, 6 insertions(+) diff --git a/daemon/remote.c b/daemon/remote.c index 3ccc5affc..df866c860 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -7616,6 +7616,7 @@ fr_worker_pickup_outside_network(struct worker* worker) } } +#ifdef USE_DNSTAP /** Fast reload, the worker picks up changes to DNSTAP configuration. */ static void fr_worker_pickup_dnstap_changes(struct worker* worker) @@ -7638,8 +7639,11 @@ fr_worker_pickup_dnstap_changes(struct worker* worker) d_dtenv->log_forwarder_query_messages; w_dtenv->log_forwarder_response_messages = d_dtenv->log_forwarder_response_messages; + lock_basic_lock(&d_dtenv->sample_lock); w_dtenv->sample_rate = d_dtenv->sample_rate; + lock_basic_unlock(&d_dtenv->sample_lock); } +#endif /* USE_DNSTAP */ void fast_reload_worker_pickup_changes(struct worker* worker) diff --git a/doc/Changelog b/doc/Changelog index 16227e459..e4b643481 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -2,6 +2,8 @@ - Merge #1374: Mesh reply counters. This adds the statistics num.queries.replyaddr_limit and requestlist.current.replies. + - Merge #1375: Copy DNSTAP changes from daemon to workers after + fast_reload. 12 November 2025: Wouter - Fix that when discard timeout drops packet, they are accounted as -- 2.47.3