From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 23 Sep 2020 14:06:32 +0000 (+0200)
Subject: A few more g_negache un-threading cases.
X-Git-Tag: auth-4.4.0-alpha2~66^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29d7557748a590a8ee0fe2f4ff2ccadbb1882e50;p=thirdparty%2Fpdns.git

A few more g_negache un-threading cases.
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 2cd4a86dd6..26641c7451 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -3150,11 +3150,12 @@ static void doStats(void)
   uint64_t cacheSize = g_recCache->size();
   auto rc_stats = g_recCache->stats();
   double r = rc_stats.second == 0 ? 0.0 : (100.0 * rc_stats.first / rc_stats.second);
-  
+  uint64_t negCacheSize = g_negCache->size();
+
   if(g_stats.qcounter && (cacheHits + cacheMisses) && SyncRes::s_queries && SyncRes::s_outqueries) {
     g_log<<Logger::Notice<<"stats: "<<g_stats.qcounter<<" questions, "<<
       cacheSize << " cache entries, "<<
-      broadcastAccFunction<uint64_t>(pleaseGetNegCacheSize)<<" negative entries, "<<
+      negCacheSize<<" negative entries, "<<
       (int)((cacheHits*100.0)/(cacheHits+cacheMisses))<<"% cache hits"<<endl;
     g_log << Logger::Notice<< "stats: cache contended/acquired " << rc_stats.first << '/' << rc_stats.second << " = " << r << '%' << endl;
 
diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index 4cb3de9c7c..a192962a23 100644
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -894,15 +894,9 @@ static uint64_t getThrottleSize()
   return broadcastAccFunction<uint64_t>(pleaseGetThrottleSize);
 }
 
-uint64_t* pleaseGetNegCacheSize()
-{
-  uint64_t tmp = g_negCache->size();
-  return new uint64_t(tmp);
-}
-
 static uint64_t getNegCacheSize()
 {
-  return broadcastAccFunction<uint64_t>(pleaseGetNegCacheSize);
+  return g_negCache->size();
 }
 
 static uint64_t* pleaseGetFailedHostsSize()
diff --git a/pdns/recursor_cache.cc b/pdns/recursor_cache.cc
index 2748ea8013..4f209d3147 100644
--- a/pdns/recursor_cache.cc
+++ b/pdns/recursor_cache.cc
@@ -386,9 +386,6 @@ void MemRecursorCache::replace(time_t now, const DNSName &qname, const QType& qt
   ce.d_records.clear();
   ce.d_records.reserve(content.size());
 
-  if (ce.d_qtype == QType::DNSKEY || ce.d_qtype == QType::SOA) {
-    maxTTD = now + 1;
-  }
   for(const auto& i : content) {
     /* Yes, we have altered the d_ttl value by adding time(nullptr) to it
        prior to calling this function, so the TTL actually holds a TTD. */
diff --git a/pdns/syncres.hh b/pdns/syncres.hh
index 4b61031714..616ebd0a84 100644
--- a/pdns/syncres.hh
+++ b/pdns/syncres.hh
@@ -1096,7 +1096,6 @@ std::shared_ptr<SyncRes::domainmap_t> parseAuthAndForwards();
 uint64_t* pleaseGetNsSpeedsSize();
 uint64_t* pleaseGetFailedServersSize();
 uint64_t* pleaseGetEDNSStatusesSize();
-uint64_t* pleaseGetNegCacheSize();
 uint64_t* pleaseGetConcurrentQueries();
 uint64_t* pleaseGetThrottleSize();
 uint64_t* pleaseGetPacketCacheHits();