dnsdist: The check interval applies to health-check, not timeouts

diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index 19941564f7c3ca46a7158ad2c62e8ccdf829eb2f..ea09c45487b99d3b31c3fa8bad136529cd6d3094 100644 (file)
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -1850,17 +1850,6 @@ static void healthChecksThread()
     auto mplexer = std::unique_ptr<FDMultiplexer>(FDMultiplexer::getMultiplexerSilent());
     auto states = g_dstates.getLocal(); // this points to the actual shared_ptrs!
     for(auto& dss : *states) {
-      if (++dss->lastCheck < dss->checkInterval) {
-        continue;
-      }
-
-      dss->lastCheck = 0;
-
-      if (dss->availability == DownstreamState::Availability::Auto) {
-        if (!queueHealthCheck(mplexer, dss)) {
-          updateHealthCheckResult(dss, false, false);
-        }
-      }
 
       auto delta = dss->sw.udiffAndSet()/1000000.0;
       dss->queryLoad.store(1.0*(dss->queries.load() - dss->prev.queries.load())/delta);
@@ -1903,6 +1892,19 @@ static void healthChecksThread()
           g_rings.insertResponse(ts, ids.origRemote, ids.qname, ids.qtype, std::numeric_limits<unsigned int>::max(), 0, fake, dss->remote, dss->getProtocol());
         }
       }
+
+      if (++dss->lastCheck < dss->checkInterval) {
+        continue;
+      }
+
+      dss->lastCheck = 0;
+
+      if (dss->availability == DownstreamState::Availability::Auto) {
+        if (!queueHealthCheck(mplexer, dss)) {
+          updateHealthCheckResult(dss, false, false);
+        }
+      }
+
     }
 
     handleQueuedHealthChecks(*mplexer);