From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Mon, 23 Jun 2008 07:00:02 +0000 (+0000)
Subject: fix meritsrecursion issue + reduce cache cleaning
X-Git-Tag: rec-3.1.7.1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=409b955f704f1eb1dfb17b49b31c2dbf79b45edf;p=thirdparty%2Fpdns.git

fix meritsrecursion issue + reduce cache cleaning


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1222 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/packetcache.cc b/pdns/packetcache.cc
index c18dea2931..e0bb1c7851 100644
--- a/pdns/packetcache.cc
+++ b/pdns/packetcache.cc
@@ -45,7 +45,7 @@ PacketCache::PacketCache()
 int PacketCache::get(DNSPacket *p, DNSPacket *cached)
 {
   extern StatBag S;
-  if(!((d_hit+d_miss)%5000)) {
+  if(!((d_hit+d_miss)%15000)) {
     cleanup();
   }
 
@@ -121,7 +121,7 @@ void PacketCache::insert(DNSPacket *q, DNSPacket *r)
 
   bool packetMeritsRecursion=d_doRecursion && q->d.rd;
 
-  insert(q->qdomain, q->qtype, PacketCache::PACKETCACHE, r->getString(), packetMeritsRecursion ? d_recursivettl : d_ttl);  // XXX FIXME forgets meritsRecursion
+  insert(q->qdomain, q->qtype, PacketCache::PACKETCACHE, r->getString(), packetMeritsRecursion ? d_recursivettl : d_ttl, packetMeritsRecursion);
 }
 
 // universal key appears to be: qname, qtype, kind (packet, query cache), optionally zoneid, meritsRecursion
@@ -130,7 +130,7 @@ void PacketCache::insert(const string &qname, const QType& qtype, CacheEntryType
   if(!ttl)
     return;
   
-  //  cerr<<"Inserting qname '"<<qname<<"', cet: "<<(int)cet<<", value: '"<< (cet ? value : "PACKET") <<"', qtype: "<<qtype.getName()<<endl;
+  //  cerr<<"Inserting qname '"<<qname<<"', cet: "<<(int)cet<<", value: '"<< (cet ? value : "PACKET") <<"', qtype: "<<qtype.getName()<<", ttl: "<<ttl<<endl;
 
   CacheEntry val;
   val.ttd=time(0)+ttl;
@@ -225,7 +225,7 @@ int PacketCache::purge(const vector<string> &matches)
 	  //	cerr<<"Stopping!"<<endl;
 	  break;
 	}
-	//      cerr<<"Will erase '"<<iter->qname<<"'\n";
+	//	cerr<<"Will erase '"<<iter->qname<<"'\n";
 
 	delcount++;
       }