Commit 06049b1c authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] stats counter for priming queries

4795.	[func]		A new statistics counter has been added to track
			priming queries. [RT #46313]
parent 3b4f23cd
4795. [func] A new statistics counter has been added to track
priming queries. [RT #46313]
4794. [func] "dnssec-checkds -s" specifies a file from which
to read a DS set rather than querying the parent.
[RT #44667]
......
......@@ -395,6 +395,7 @@ init_desc(void) {
SET_RESSTATDESC(serverquota, "spilled due to server quota",
"ServerQuota");
SET_RESSTATDESC(nextitem, "waited for next item", "NextItem");
SET_RESSTATDESC(priming, "priming queries", "Priming");
INSIST(i == dns_resstatscounter_max);
......@@ -1615,7 +1616,7 @@ generatexml(named_server_t *server, isc_uint32_t flags,
ISC_XMLCHAR "type=\"text/xsl\" href=\"/bind9.xsl\""));
TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "statistics"));
TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "version",
ISC_XMLCHAR "3.10"));
ISC_XMLCHAR "3.11"));
/* Set common fields for statistics dump */
dumparg.type = isc_statsformat_xml;
......@@ -2411,7 +2412,7 @@ generatejson(named_server_t *server, size_t *msglen,
/*
* These statistics are included no matter which URL we use.
*/
obj = json_object_new_string("1.4");
obj = json_object_new_string("1.5");
CHECKMEM(obj);
json_object_object_add(bindstats, "json-stats-version", obj);
......
......@@ -137,5 +137,12 @@ fi
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
ret=0
n=`expr $n + 1`
echo "I:checking priming queries are counted ($n)"
grep "1 priming queries" ns3/named.stats
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
echo "I:exit status: $status"
[ $status -eq 0 ] || exit 1
......@@ -683,6 +683,12 @@
queries. [RT #45847]
</para>
</listitem>
<listitem>
<para>
A new statistics counter has been added to track priming
queries. [RT #46313]
</para>
</listitem>
<listitem>
<para>
The <command>dnssec-signzone -x</command> flag and the
......
......@@ -64,7 +64,8 @@ enum {
dns_resstatscounter_zonequota = 41,
dns_resstatscounter_serverquota = 42,
dns_resstatscounter_nextitem = 43,
dns_resstatscounter_max = 44,
dns_resstatscounter_priming = 44,
dns_resstatscounter_max = 45,
/*
* DNSSEC stats.
......
......@@ -9987,6 +9987,7 @@ dns_resolver_prime(dns_resolver_t *res) {
res->priming = ISC_FALSE;
UNLOCK(&res->lock);
}
inc_stats(res, dns_resstatscounter_priming);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment