Changeset 2328

Timestamp:

01/04/12 10:42:47 (17 months ago)

Author:

peter

Message:

Implement domainmetadata cache pruning. Change (for ALL caches) meaning of "max-X-entries=0" from unlimited to actually mean 0.

Location:

trunk/pdns/pdns

Files:

• cachecleaner.hh (modified) (1 diff)
• dbdnsseckeeper.cc (modified) (6 diffs)
• dnsseckeeper.hh (modified) (1 diff)

trunk/pdns/pdns/cachecleaner.hh

@@ -12 +12 @@
   unsigned int cacheSize=collection.size();
 
-  if(maxCached && cacheSize > maxCached) {
+  if(cacheSize > maxCached) {
     toTrim = cacheSize - maxCached;
   }

trunk/pdns/pdns/dbdnsseckeeper.cc

@@ -31 +31 @@
 #include <boost/assign/list_inserter.hpp>
 #include "base64.hh"
+#include "cachecleaner.hh"
+#include "arguments.hh"
 
 
@@ -41 +43 @@
 pthread_mutex_t DNSSECKeeper::s_metacachelock = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t DNSSECKeeper::s_keycachelock = PTHREAD_MUTEX_INITIALIZER;
+unsigned int DNSSECKeeper::s_ops;
+time_t DNSSECKeeper::s_last_prune;
 
 bool DNSSECKeeper::isSecuredZone(const std::string& zone) 
@@ -47 +51 @@
     return true;
   
+  if(!((s_ops++) % 100000)) {
+    cleanup();
+  }
+
   {
     Lock l(&s_keycachelock);
@@ -178 +186 @@
   value.clear();
   unsigned int now = time(0);
+
+  if(!((s_ops++) % 100000)) {
+    cleanup();
+  }
+
   {
     Lock l(&s_metacachelock); 
@@ -265 +278 @@
 {
   unsigned int now = time(0);
+
+  if(!((s_ops++) % 100000)) {
+    cleanup();
+  }
+
   {
     Lock l(&s_keycachelock);
@@ -371 +389 @@
   return false;
 }
+
+void DNSSECKeeper::cleanup()
+{
+  struct timeval now;
+  Utility::gettimeofday(&now, 0);
+
+  if(now.tv_sec - s_last_prune > (time_t)(30)) {
+    {
+        Lock l(&s_metacachelock);
+        pruneCollection(s_metacache, ::arg().asNum("max-cache-entries"));
+    }
+    {
+        Lock l(&s_keycachelock);
+        pruneCollection(s_keycache, ::arg().asNum("max-cache-entries"));
+    }
+    s_last_prune=time(0);
+  }
+}

trunk/pdns/pdns/dnsseckeeper.hh

@@ -152 +152 @@
   > metacache_t;
 
+  void cleanup();
+
   static keycache_t s_keycache;
   static metacache_t s_metacache;
   static pthread_mutex_t s_metacachelock;
   static pthread_mutex_t s_keycachelock;
+  static unsigned int s_ops;
+  static time_t s_last_prune;
 };