Process comments from review by @rgacogne, thanks!

diff --git a/pdns/recursordist/aggressive_nsec.hh b/pdns/recursordist/aggressive_nsec.hh
index b73c549d51600892c26fd4d0a026a7df7c1a73c1..57ed2a2202bfdaec8e24d7b1e3f96e68baa74ceb 100644 (file)
--- a/pdns/recursordist/aggressive_nsec.hh
+++ b/pdns/recursordist/aggressive_nsec.hh
@@ -21,6 +21,7 @@
  */
 #pragma once
 
+#include <atomic>
 #include <boost/utility.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/ordered_index.hpp>
@@ -162,7 +163,7 @@ private:
   pdns::stat_t d_nsecWildcardHits{0};
   pdns::stat_t d_nsec3WildcardHits{0};
   pdns::stat_t d_entriesCount{0};
-  uint64_t d_maxEntries{0};
+  std::atomic<uint64_t> d_maxEntries{0};
 };
 
 extern std::unique_ptr<AggressiveNSECCache> g_aggressiveNSECCache;

diff --git a/pdns/recursordist/docs/manpages/rec_control.1.rst b/pdns/recursordist/docs/manpages/rec_control.1.rst
index 2049eb833dc9a33475c1159075a94ce7ad562e43..716af75bbcb344937a7123fb423d8d7e10450317 100644 (file)
--- a/pdns/recursordist/docs/manpages/rec_control.1.rst
+++ b/pdns/recursordist/docs/manpages/rec_control.1.rst
@@ -231,7 +231,7 @@ set-max-aggr-nsec-cache-size *NUM*
     Change the maximum number of entries in the NSEC aggressive cache. If the
     cache is disabled by setting its size to 0 in the config, the cache size
     cannot be set by this command. Setting the size to 0 by this command still
-    keeps the cache, but makes it mostly ineffective as it emptied periodically.
+    keeps the cache, but makes it mostly ineffective as it is emptied periodically.
 
 set-max-cache-entries *NUM*
     Change the maximum number of entries in the DNS cache.  If reduced, the

diff --git a/pdns/recursordist/rec_channel_rec.cc b/pdns/recursordist/rec_channel_rec.cc
index 92889fed47a779f31141c4f637c94d9f4d2b823c..1503c3def7cb1ee4f23c4ef9d63380adf5d26c3e 100644 (file)
--- a/pdns/recursordist/rec_channel_rec.cc
+++ b/pdns/recursordist/rec_channel_rec.cc
@@ -2104,7 +2104,7 @@ static RecursorControlChannel::Answer help()
           "reload-lua-config [filename]     (re)load Lua configuration file\n"
           "reload-zones                     reload all auth and forward zones\n"
           "set-ecs-minimum-ttl value        set ecs-minimum-ttl-override\n"
-          "set-max-aggr-nsec-cache-size     set new maximum aggressive NSEC cache size\n"
+          "set-max-aggr-nsec-cache-size value set new maximum aggressive NSEC cache size\n"
           "set-max-cache-entries value      set new maximum record cache size\n"
           "set-max-packetcache-entries val  set new maximum packet cache size\n"
           "set-minimum-ttl value            set minimum-ttl-override\n"