From: bert hubert <bert.hubert@powerdns.com>
Date: Sun, 7 Oct 2018 14:49:10 +0000 (+0200)
Subject: add variable-responses metric to pdns_recursor
X-Git-Tag: rec-4.2.0-alpha1~42^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49dc532e6aa29b5e96316c78c241db317fa22e1a;p=thirdparty%2Fpdns.git

add variable-responses metric to pdns_recursor
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index c41287bad6..baa655025c 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1567,6 +1567,9 @@ static void startDoResolve(void *p)
       if(sendmsg(dc->d_socket, &msgh, 0) < 0 && g_logCommonErrors) 
         g_log<<Logger::Warning<<"Sending UDP reply to client "<<dc->getRemote()<<" failed with: "<<strerror(errno)<<endl;
 
+      if(variableAnswer || sr.wasVariable()) {
+	g_stats.variableResponses++;
+      }
       if(!SyncRes::s_nopacketcache && !variableAnswer && !sr.wasVariable() ) {
         t_packetCache->insertResponsePacket(dc->d_tag, dc->d_qhash, std::move(dc->d_query), dc->d_mdp.d_qname, dc->d_mdp.d_qtype, dc->d_mdp.d_qclass,
                                             string((const char*)&*packet.begin(), packet.size()),
diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index 80aec94e20..0259c68758 100644
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -1013,9 +1013,12 @@ void registerAllStats()
   addGetStat("edns-ping-matches", &g_stats.ednsPingMatches);
   addGetStat("edns-ping-mismatches", &g_stats.ednsPingMismatches);
   addGetStat("dnssec-queries", &g_stats.dnssecQueries);
+
   addGetStat("dnssec-authentic-data-queries", &g_stats.dnssecAuthenticDataQueries);
   addGetStat("dnssec-check-disabled-queries", &g_stats.dnssecCheckDisabledQueries);
 
+  addGetStat("variable-responses", &g_stats.variableResponses);
+
   addGetStat("noping-outqueries", &g_stats.noPingOutQueries);
   addGetStat("noedns-outqueries", &g_stats.noEdnsOutQueries);
 
diff --git a/pdns/syncres.hh b/pdns/syncres.hh
index 3dd579092e..ae8f274f0f 100644
--- a/pdns/syncres.hh
+++ b/pdns/syncres.hh
@@ -932,6 +932,7 @@ struct RecursorStats
   std::atomic<uint64_t> dnssecQueries;
   std::atomic<uint64_t> dnssecAuthenticDataQueries;
   std::atomic<uint64_t> dnssecCheckDisabledQueries;
+  std::atomic<uint64_t> variableResponses;
   unsigned int maxMThreadStackUsage;
   std::atomic<uint64_t> dnssecValidations; // should be the sum of all dnssecResult* stats
   std::map<vState, std::atomic<uint64_t> > dnssecResults;