diff --git a/core/src/cluster_info.rs b/core/src/cluster_info.rs index bbbc47d2af..1fb3cbeb08 100644 --- a/core/src/cluster_info.rs +++ b/core/src/cluster_info.rs @@ -1493,12 +1493,6 @@ impl ClusterInfo { .time_gossip_write_lock("purge", &self.stats.purge) .purge(timestamp(), &timeouts); inc_new_counter_info!("cluster_info-purge-count", num_purged); - let table_size = self.gossip.read().unwrap().crds.table.len(); - datapoint_debug!( - "cluster_info-purge", - ("table_size", table_size as i64, i64), - ("purge_stake_timeout", timeout as i64, i64) - ); } /// randomly pick a node and ask them for updates asynchronously @@ -2087,6 +2081,10 @@ impl ClusterInfo { fn print_reset_stats(&self, last_print: &mut Instant) { if last_print.elapsed().as_millis() > 2000 { + let (table_size, purged_values_size) = { + let r_gossip = self.gossip.read().unwrap(); + (r_gossip.crds.table.len(), r_gossip.pull.purged_values.len()) + }; datapoint_info!( "cluster_info_stats", ("entrypoint", self.stats.entrypoint.clear(), i64), @@ -2110,6 +2108,8 @@ impl ClusterInfo { self.stats.new_push_requests_num.clear(), i64 ), + ("table_size", table_size as i64, i64), + ("purged_values_size", purged_values_size as i64, i64), ); datapoint_info!( "cluster_info_stats2", diff --git a/core/src/crds_gossip_pull.rs b/core/src/crds_gossip_pull.rs index f5168c27f1..9191568a63 100644 --- a/core/src/crds_gossip_pull.rs +++ b/core/src/crds_gossip_pull.rs @@ -131,7 +131,7 @@ pub struct CrdsGossipPull { /// timestamp of last request pub pull_request_time: HashMap, /// hash and insert time - purged_values: VecDeque<(Hash, u64)>, + pub purged_values: VecDeque<(Hash, u64)>, pub crds_timeout: u64, pub msg_timeout: u64, pub num_pulls: usize, @@ -365,8 +365,10 @@ impl CrdsGossipPull { for (value_hash, _insert_timestamp) in &self.purged_values { filters.iter_mut().for_each(|filter| filter.add(value_hash)); } + filters } + /// filter values that fail the bloom filter up to max_bytes fn filter_crds_values( &self,