Changeset 786

Timestamp:

04/28/06 12:13:44 (4 years ago)

Author:

ahu

Message:

tune throttling, add unreachable accounting

Location:

trunk/pdns/pdns

Files:

• rec_channel_rec.cc (modified) (1 diff)
• syncres.cc (modified) (3 diffs)
• syncres.hh (modified) (2 diffs)

trunk/pdns/pdns/rec_channel_rec.cc

@@ -170 +170 @@
   addGetStat("throttled-outqueries", &SyncRes::s_throttledqueries);
   addGetStat("throttled-out", &SyncRes::s_throttledqueries);
+  addGetStat("unreachables", &SyncRes::s_unreachables);
 
   addGetStat("query-rate", getQueryRate);

trunk/pdns/pdns/syncres.cc

@@ -47 +47 @@
 unsigned int SyncRes::s_throttledqueries;
 unsigned int SyncRes::s_nodelegated;
+unsigned int SyncRes::s_unreachables;
+
 SyncRes::domainmap_t SyncRes::s_domainmap;
 string SyncRes::s_serverID;
@@ -587 +589 @@
                 g_stats.resourceLimits++;
               }
-              else
+              else {
+                s_unreachables++; d_unreachables++;
                 LOG<<prefix<<qname<<": error resolving "<< (doTCP ? "over TCP" : "") << endl;
+              }
               
               if(resolveret!=-2) { // don't account for resource limits, they are our own fault
                 s_nsSpeeds[*tns].submit(1000000, &d_now); // 1 sec
-                s_throttle.throttle(d_now.tv_sec, make_tuple(*remoteIP, qname, qtype.getCode()),20,5);
+                if(resolveret==-1)
+                  s_throttle.throttle(d_now.tv_sec, make_tuple(*remoteIP, qname, qtype.getCode()), 60, 100); // unreachable
+                else
+                  s_throttle.throttle(d_now.tv_sec, make_tuple(*remoteIP, qname, qtype.getCode()), 20, 5);  // timeout
               }
               continue;
@@ -600 +607 @@
           wasLame:; // well, it didn't
             LOG<<prefix<<qname<<": status=NS "<<*tns<<" ("<<U32ToIP(*remoteIP)<<") is lame for '"<<auth<<"', trying sibling IP or NS"<<endl;
-            s_throttle.throttle(d_now.tv_sec, make_tuple(*remoteIP, qname, qtype.getCode()),60,0);
+            s_throttle.throttle(d_now.tv_sec, make_tuple(*remoteIP, qname, qtype.getCode()), 60, 100);
           }
         }

trunk/pdns/pdns/syncres.hh

@@ -212 +212 @@
 {
 public:
-  explicit SyncRes(const struct timeval& now) :  d_outqueries(0), d_tcpoutqueries(0), d_throttledqueries(0), d_timeouts(0), d_now(now),
-                                                d_cacheonly(false), d_nocache(false) { }
+  explicit SyncRes(const struct timeval& now) :  d_outqueries(0), d_tcpoutqueries(0), d_throttledqueries(0), d_timeouts(0), d_unreachables(0),
+                                                 d_now(now),
+                                                 d_cacheonly(false), d_nocache(false) { }
   int beginResolve(const string &qname, const QType &qtype, uint16_t qclass, vector<DNSResourceRecord>&ret);
   void setId(int id)
@@ -238 +239 @@
   static unsigned int s_tcpoutqueries;
   static unsigned int s_nodelegated;
+  static unsigned int s_unreachables;
   unsigned int d_outqueries;
   unsigned int d_tcpoutqueries;
   unsigned int d_throttledqueries;
   unsigned int d_timeouts;
+  unsigned int d_unreachables;
+
   //  typedef map<string,NegCacheEntry> negcache_t;