upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Do not reset rrset.bogus stats when called using stats_noreset.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4291 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Ralph Dolmans 2017-08-03 10:50:46 +00:00
parent de731edc0d
commit 9f49585a63
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/stats.c
View file

@ -123,7 +123,7 @@ void server_stats_log(struct ub_server_stats* stats, struct worker* worker,
/** get rrsets bogus number from validator */ /** get rrsets bogus number from validator */
static size_t static size_t
get_rrset_bogus(struct worker* worker) get_rrset_bogus(struct worker* worker, int reset)
{ {
int m = modstack_find(&worker->env.mesh->mods, "validator"); int m = modstack_find(&worker->env.mesh->mods, "validator");
struct val_env* ve; struct val_env* ve;
@ -133,7 +133,7 @@ get_rrset_bogus(struct worker* worker)
ve = (struct val_env*)worker->env.modinfo[m]; ve = (struct val_env*)worker->env.modinfo[m];
lock_basic_lock(&ve->bogus_lock); lock_basic_lock(&ve->bogus_lock);
r = ve->num_rrset_bogus; r = ve->num_rrset_bogus;
if(!worker->env.cfg->stat_cumulative) if(reset && !worker->env.cfg->stat_cumulative)
ve->num_rrset_bogus = 0; ve->num_rrset_bogus = 0;
lock_basic_unlock(&ve->bogus_lock); lock_basic_unlock(&ve->bogus_lock);
return r; return r;
@ -169,7 +169,7 @@ server_stats_compile(struct worker* worker, struct ub_stats_info* s, int reset)
s->svr.qtcp_outgoing = (long long)worker->back->num_tcp_outgoing; s->svr.qtcp_outgoing = (long long)worker->back->num_tcp_outgoing;
/* get and reset validator rrset bogus number */ /* get and reset validator rrset bogus number */
s->svr.rrset_bogus = (long long)get_rrset_bogus(worker); s->svr.rrset_bogus = (long long)get_rrset_bogus(worker, reset);
/* get cache sizes */ /* get cache sizes */
s->svr.msg_cache_count = (long long)count_slabhash_entries(worker->env.msg_cache); s->svr.msg_cache_count = (long long)count_slabhash_entries(worker->env.msg_cache);

1
doc/Changelog
View file

@ -1,5 +1,6 @@
3 August 2017: Ralph 3 August 2017: Ralph
- Remove unused iter_env member (ip6arpa_dname) - Remove unused iter_env member (ip6arpa_dname)
- Do not reset rrset.bogus stats when called using stats_noreset.
3 August 2017: Wouter 3 August 2017: Wouter
- Fix #1394: mix of serve-expired and response-ip could cause a crash. - Fix #1394: mix of serve-expired and response-ip could cause a crash.