From 7becf07fb49968bdd60e83a04ab52b8a2976eab3 Mon Sep 17 00:00:00 2001
From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Tue, 21 Jun 2005 18:34:17 +0000
Subject: [PATCH] improve statistics for the recursor, split out timeout and
 real errors, report on outgoing timeouts clarify non-existent statistics w/o
 queries

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@414 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---
 pdns/lwres.cc         |  1 -
 pdns/pdns_recursor.cc |  7 +++++--
 pdns/syncres.cc       | 15 ++++++++++++---
 pdns/syncres.hh       |  1 +
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pdns/lwres.cc b/pdns/lwres.cc
index b01cc8eb9..a50415cb2 100644
--- a/pdns/lwres.cc
+++ b/pdns/lwres.cc
@@ -75,7 +75,6 @@ int LWRes::asyncresolve(const string &ip, const char *domain, int type)
   toaddr.sin_port=htons(53);
   toaddr.sin_family=AF_INET;
 
-
   int ret;
 
   DTime dt;
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index ecfedb020..500374f48 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1,6 +1,6 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2005  PowerDNS.COM BV
+    Copyright (C) 2003 - 2005  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License version 2 
@@ -359,8 +359,11 @@ void doStats(void)
     L<<Logger::Error<<", outpacket/query ratio "<<(int)(SyncRes::s_outqueries*100.0/SyncRes::s_queries)<<"%";
     L<<Logger::Error<<", "<<(int)(SyncRes::s_throttledqueries*100.0/(SyncRes::s_outqueries+SyncRes::s_throttledqueries))<<"% throttled, "
      <<SyncRes::s_nodelegated<<" no-delegation drops"<<endl;
-    L<<Logger::Error<<"queries running: "<<MT->numProcesses()<<endl;
+    L<<Logger::Error<<"stats: "<<MT->numProcesses()<<" queries running, "<<SyncRes::s_outgoingtimeouts<<" outgoing timeouts"<<endl;
   }
+  else if(statsWanted) 
+    L<<Logger::Error<<"stats: no stats yet!"<<endl;
+
   statsWanted=false;
 }
 
diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 20e900eba..769beaedc 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -37,6 +37,7 @@ extern MemRecursorCache RC;
 
 map<string,NegCacheEntry> SyncRes::s_negcache;    
 unsigned int SyncRes::s_queries;
+unsigned int SyncRes::s_outgoingtimeouts;
 unsigned int SyncRes::s_outqueries;
 unsigned int SyncRes::s_throttledqueries;
 unsigned int SyncRes::s_nodelegated;
@@ -385,10 +386,18 @@ int SyncRes::doResolveAt(set<string> nameservers, string auth, const string &qna
       else {
 	s_outqueries++;
 	d_outqueries++;
-	if(d_lwr.asyncresolve(remoteIP,qname.c_str(),qtype.getCode())!=1) { // <- we go out on the wire!
-	  LOG<<prefix<<qname<<": error resolving (perhaps timeout?)"<<endl;
+	int ret=d_lwr.asyncresolve(remoteIP,qname.c_str(),qtype.getCode());
+	if(ret != 1) { // <- we go out on the wire!
+	  if(ret==0) {
+	    LOG<<prefix<<qname<<": timeout resolving"<<endl;
+	    d_timeouts++;
+	    s_outgoingtimeouts++;
+	  }
+	  else
+	    LOG<<prefix<<qname<<": error resolving"<<endl;
+
 	  nsSpeeds[toLower(*tns)].submit(1000000); // 1 sec
-	  d_timeouts++;
+	  
 	  s_throttle.throttle(d_now, remoteIP+"|"+qname+"|"+qtype.getName(),20,5);
 	  continue;
 	}
diff --git a/pdns/syncres.hh b/pdns/syncres.hh
index ae89f77ee..750951272 100644
--- a/pdns/syncres.hh
+++ b/pdns/syncres.hh
@@ -135,6 +135,7 @@ public:
     d_nocache=state;
   }
   static unsigned int s_queries;
+  static unsigned int s_outgoingtimeouts;
   static unsigned int s_throttledqueries;
   static unsigned int s_outqueries;
   static unsigned int s_nodelegated;
-- 
2.50.0