Changeset 464

Timestamp:

09/01/05 20:35:10 (8 years ago)

Author:

ahu

Message:

make recursor quiet by default
update to 2.9.19-svn version
work on dnsreplay

Location:

trunk/pdns

Files:

• configure.in (modified) (1 diff)
• pdns/dnsreplay-mindex.cc (modified) (8 diffs)
• pdns/pdns_recursor.cc (modified) (1 diff)

trunk/pdns/configure.in

@@ -1 +1 @@
 dnl intro
 AC_INIT(pdns/receiver.cc)
-AM_INIT_AUTOMAKE(pdns, 2.9.18)
+AM_INIT_AUTOMAKE(pdns, 2.9.19-svn)
 AC_CANONICAL_HOST
 AM_CONFIG_HEADER(config.h)

trunk/pdns/pdns/dnsreplay-mindex.cc

@@ -31 +31 @@
 #include <set>
 #include <deque>
+#include <boost/format.hpp>
 #include <boost/utility.hpp>
 #include <boost/multi_index_container.hpp>
@@ -101 +102 @@
 > qids_t;
                                          
-
-//typedef map<QuestionIdentifier, shared_ptr<QuestionData> > qids_t;
 qids_t qids;
 
-//typedef map<uint16_t, struct QuestionIdentifier > id2qi_t;
-//id2qi_t id2qi;
-
-unsigned int s_questions, s_answers, s_wetimedout, s_perfect, s_mostly, s_origtimedout;
+
+bool g_throttled;
+
+unsigned int s_questions, s_origanswers, s_weanswers, s_wetimedout, s_perfect, s_mostly, s_origtimedout;
 unsigned int s_wenever, s_orignever;
 unsigned int s_webetter, s_origbetter, s_norecursionavailable;
@@ -128 +127 @@
 
 
-pair<unsigned int, unsigned int> WeOrigSlowQueriesDelta()
+void WeOrigSlowQueriesDelta(int& weOutstanding, int& origOutstanding, int& weSlow, int& origSlow)
 {
   struct timeval now;
   gettimeofday(&now, 0);
 
-  pair<unsigned int, unsigned int> ret=make_pair(0,0);
+  weOutstanding=origOutstanding=weSlow=origSlow=0;
+
   for(qids_t::iterator i=qids.begin(); i!=qids.end(); ++i) {
     double dt=DiffTime(i->d_resentTime, now);
-    if(dt > 2.0) {
+    if(dt < 2.0) {
+      if(i->d_newRcode == -1) 
+        weOutstanding++;
+      if(i->d_origRcode == -1)
+        origOutstanding++;
+    }
+    else {
       if(i->d_newRcode == -1) {
+        weSlow++;
         if(!i->d_newlate) {
-          //      i->d_newlate=true;Â // error
+          QuestionData qd=*i;
+          qd.d_newlate=true;
+          qids.replace(i, qd);
+
           s_wetimedout++;
         }
-        ret.first++;
       }
       if(i->d_origRcode == -1) {
+        origSlow++;
         if(!i->d_origlate) {
           QuestionData qd=*i;
@@ -152 +162 @@
           s_origtimedout++;
         }
-        ret.second++;
-      }
-    }
-  }
-  return ret;
+      }
+    }
+  }
 }
 
@@ -243 +251 @@
   while(s_socket->recvFromAsync(packet, remote)) {
     try {
+      s_weanswers++;
       MOADNSParser mdp(packet.c_str(), packet.length());
       if(!mdp.d_header.qr) {
@@ -314 +323 @@
 void houseKeeping()
 {
-  pair<unsigned int, unsigned int> slows=WeOrigSlowQueriesDelta();
+  static timeval last;
+
+  struct timeval now;
+  gettimeofday(&now, 0);
+
+  if(DiffTime(last, now) < 0.3)
+    return;
+
+  int weWaitingFor, origWaitingFor, weSlow, origSlow;
+  WeOrigSlowQueriesDelta(weWaitingFor, origWaitingFor, weSlow, origSlow);
     
-  int waitingFor=qids.size() - slows.first - slows.second;
-  if(waitingFor > 1000) {
-    cerr<<"Too many questions outstanding, waiting 0.25 seconds"<<endl;
-    usleep(250000);
-  }
-  
-  cerr<<waitingFor<<" queries that could still come in on time, "<<qids.size()<<" outstanding"<<endl;
-  
-  cerr<<"we late: "<<s_wetimedout<<", orig late: "<< s_origtimedout<<", "<<s_questions<<" questions sent, "<<s_answers
+  if(!g_throttled) {
+    if( weWaitingFor > 1000) {
+      cerr<<"Too many questions ("<<weWaitingFor<<") outstanding, throttling"<<endl;
+      g_throttled=true;
+    }
+  }
+  else if(weWaitingFor < 750) {
+    cerr<<"Unthrottling ("<<weWaitingFor<<")"<<endl;
+    g_throttled=false;
+  }
+
+  if(DiffTime(last, now) < 2)
+    return;
+
+  last=now;
+
+  /*
+        Questions - Pend. - Drop = Answers = (On time + Late) = (Err + Ok)
+Orig    9           21      29     36         47        57       66    72
+
+
+   */
+
+  format headerfmt   ("%|9t|Questions - Pend. - Drop = Answers = (On time + Late) = (Err + Ok)\n");
+  format datafmt("%s%|9t|%d %|21t|%d %|29t|%d %|36t|%d %|47t|%d %|57t|%d %|66t|%d %|72t|%d\n");
+
+  
+  cerr<<headerfmt;
+  cerr<<(datafmt % "Orig"   % s_questions % origWaitingFor  % s_orignever  % s_origanswers % 0 % s_origtimedout  % 0 % 0);
+  cerr<<(datafmt % "Refer." % s_questions % weWaitingFor    % s_wenever    % s_weanswers   % 0 % s_wetimedout    % 0 % 0);
+
+
+
+  cerr<<weWaitingFor<<" queries that could still come in on time, "<<qids.size()<<" outstanding"<<endl;
+  
+  cerr<<"we late: "<<s_wetimedout<<", orig late: "<< s_origtimedout<<", "<<s_questions<<" questions sent, "<<s_origanswers
       <<" original answers, "<<s_perfect<<" perfect, "<<s_mostly<<" mostly correct"<<", "<<s_webetter<<" we better, "<<s_origbetter<<" orig better ("<<s_origbetterset.size()<<" diff)"<<endl;
   cerr<<"we never: "<<s_wenever<<", orig never: "<<s_orignever<<endl;
@@ -398 +443 @@
     }
     else {
-      s_answers++;
+      s_origanswers++;
       
       if(qids.count(qi)) {
@@ -459 +504 @@
   unsigned int once=0;
   for(;;) {
-    if(!((once++)%4000)) 
+    if(!((once++)%100)) 
       houseKeeping();
 
-    if(!pr.getUDPPacket())
-      break;
-
-    sendPacketFromPR(pr, remote);
+    if(!g_throttled) {
+      if(!pr.getUDPPacket())
+        break;
+      
+      sendPacketFromPR(pr, remote);
+    }
+    else 
+      usleep(1000); // move to 'swift poll' 
+
     receiveFromReference();
   }

trunk/pdns/pdns/pdns_recursor.cc

@@ -504 +504 @@
     arg().set("setgid","If set, change group id to this gid for more security")="";
     arg().set("setuid","If set, change user id to this uid for more security")="";
-    arg().set("quiet","Suppress logging of questions and answers")="off";
+    arg().set("quiet","Suppress logging of questions and answers")="true";
     arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
     arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;