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.

diff --git a/daemon/remote.c b/daemon/remote.c
index 3ccc5affcb0a60937f2cb741ec219c298c6956b5..df866c860665fbc11ec08dff689e8fc8432fa4aa 100644 (file)
--- 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 16227e4598d510c11d51b6f6120841ac9a118e7e..e4b6434819af08590b1dbc4d0ed7d18708c2778e 100644 (file)
--- 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