dnsdist: Try to fix a data race warning reported by TSAN

diff --git a/pdns/dnsdist-cache.hh b/pdns/dnsdist-cache.hh
index d8837bec5dc3c5c0633ad7d0f2556b6219b6608d..5b2ba2c78d4f88230f5091744cc005fba3c36509 100644 (file)
--- a/pdns/dnsdist-cache.hh
+++ b/pdns/dnsdist-cache.hh
@@ -45,15 +45,15 @@ public:
   bool isFull();
   string toString();
   uint64_t getSize();
-  uint64_t getHits() const { return d_hits; }
-  uint64_t getMisses() const { return d_misses; }
-  uint64_t getDeferredLookups() const { return d_deferredLookups; }
-  uint64_t getDeferredInserts() const { return d_deferredInserts; }
-  uint64_t getLookupCollisions() const { return d_lookupCollisions; }
-  uint64_t getInsertCollisions() const { return d_insertCollisions; }
+  uint64_t getHits() const { return d_hits.load(); }
+  uint64_t getMisses() const { return d_misses.load(); }
+  uint64_t getDeferredLookups() const { return d_deferredLookups.load(); }
+  uint64_t getDeferredInserts() const { return d_deferredInserts.load(); }
+  uint64_t getLookupCollisions() const { return d_lookupCollisions.load(); }
+  uint64_t getInsertCollisions() const { return d_insertCollisions.load(); }
   uint64_t getMaxEntries() const { return d_maxEntries; }
-  uint64_t getTTLTooShorts() const { return d_ttlTooShorts; }
-  uint64_t getCleanupCount() const { return d_cleanupCount; }
+  uint64_t getTTLTooShorts() const { return d_ttlTooShorts.load(); }
+  uint64_t getCleanupCount() const { return d_cleanupCount.load(); }
   uint64_t getEntriesCount();
   uint64_t dump(int fd);
 

diff --git a/regression-tests.dnsdist/test_Metrics.py b/regression-tests.dnsdist/test_Metrics.py
index 5a70d0d8cefda59b5d9ea6987cd3bb782323d862..28fd1565df88dd9412b5b5a40fea681706ad1d51 100644 (file)
--- a/regression-tests.dnsdist/test_Metrics.py
+++ b/regression-tests.dnsdist/test_Metrics.py
@@ -148,7 +148,7 @@ class TestRuleMetrics(DNSDistTest):
 
     def testServFailMetrics(self):
         """
-        Metrics: Check that servfail metrics are correctly updated for cache misses and hits
+        Metrics: Check that servfail metrics are correctly updated for server failures
         """
 
         for method in ("sendUDPQuery", "sendTCPQuery", "sendDOTQueryWrapper", "sendDOHQueryWrapper"):