dnsdist: Try to work around a TSAN false positive

tcpMaxConcurrentConnections is an indicative metric, we don't really
care if there is a small race here.

diff --git a/pdns/dnsdist-tcp.cc b/pdns/dnsdist-tcp.cc
index a8d8971154914bc33d0ef34c60cadda51420c98d..cf69ed1d89e4dda0b997a30ce8a22976d958c33f 100644 (file)
--- a/pdns/dnsdist-tcp.cc
+++ b/pdns/dnsdist-tcp.cc
@@ -1323,8 +1323,8 @@ void tcpAcceptorThread(ClientState* cs)
         continue;
       }
 
-      if (concurrentConnections > cs->tcpMaxConcurrentConnections) {
-        cs->tcpMaxConcurrentConnections = concurrentConnections;
+      if (concurrentConnections > cs->tcpMaxConcurrentConnections.load()) {
+        cs->tcpMaxConcurrentConnections.store(concurrentConnections);
       }
 
       if (ci->fd < 0) {

diff --git a/pdns/dnsdistdist/doh.cc b/pdns/dnsdistdist/doh.cc
index 6301727a37a8dbfde1a748db5e7aca6a810cdfff..5737b7fb6ed379f07be6d2c4407ea58ccd82b43f 100644 (file)
--- a/pdns/dnsdistdist/doh.cc
+++ b/pdns/dnsdistdist/doh.cc
@@ -1369,8 +1369,8 @@ static void on_accept(h2o_socket_t *listener, const char *err)
     return;
   }
 
-  if (concurrentConnections > dsc->cs->tcpMaxConcurrentConnections) {
-    dsc->cs->tcpMaxConcurrentConnections = concurrentConnections;
+  if (concurrentConnections > dsc->cs->tcpMaxConcurrentConnections.load()) {
+    dsc->cs->tcpMaxConcurrentConnections.store(concurrentConnections);
   }
 
   auto& conn = t_conns[descriptor];