removes metric for process_push_success (#29211)
This is already tracked in CrdsDataStats: https://github.com/solana-labs/solana/blob/5e799ad56/gossip/src/crds.rs#L96-L106 https://github.com/solana-labs/solana/blob/5e799ad56/gossip/src/cluster_info_metrics.rs#L652-L656 and is so duplicated. Removing the metric would simplify this code path for upcoming commits.
This commit is contained in:
parent
536b879aa7
commit
8ea5dd8b28
|
@ -2266,12 +2266,7 @@ impl ClusterInfo {
|
||||||
messages
|
messages
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.flat_map(|(from, crds_values)| {
|
.flat_map(|(from, crds_values)| {
|
||||||
let (num_success, origins) =
|
self.gossip.process_push_message(&from, crds_values, now)
|
||||||
self.gossip.process_push_message(&from, crds_values, now);
|
|
||||||
self.stats
|
|
||||||
.process_push_success
|
|
||||||
.add_relaxed(num_success as u64);
|
|
||||||
origins
|
|
||||||
})
|
})
|
||||||
.collect()
|
.collect()
|
||||||
};
|
};
|
||||||
|
|
|
@ -156,7 +156,6 @@ pub struct GossipStats {
|
||||||
pub(crate) process_pull_response_success: Counter,
|
pub(crate) process_pull_response_success: Counter,
|
||||||
pub(crate) process_pull_response_timeout: Counter,
|
pub(crate) process_pull_response_timeout: Counter,
|
||||||
pub(crate) process_push_message: Counter,
|
pub(crate) process_push_message: Counter,
|
||||||
pub(crate) process_push_success: Counter,
|
|
||||||
pub(crate) prune_message_count: Counter,
|
pub(crate) prune_message_count: Counter,
|
||||||
pub(crate) prune_message_len: Counter,
|
pub(crate) prune_message_len: Counter,
|
||||||
pub(crate) prune_message_timeout: Counter,
|
pub(crate) prune_message_timeout: Counter,
|
||||||
|
@ -235,11 +234,6 @@ pub(crate) fn submit_gossip_stats(
|
||||||
("repair_peers", stats.repair_peers.clear(), i64),
|
("repair_peers", stats.repair_peers.clear(), i64),
|
||||||
("new_push_requests", stats.new_push_requests.clear(), i64),
|
("new_push_requests", stats.new_push_requests.clear(), i64),
|
||||||
("new_push_requests2", stats.new_push_requests2.clear(), i64),
|
("new_push_requests2", stats.new_push_requests2.clear(), i64),
|
||||||
(
|
|
||||||
"process_push_success",
|
|
||||||
stats.process_push_success.clear(),
|
|
||||||
i64
|
|
||||||
),
|
|
||||||
("purge", stats.purge.clear(), i64),
|
("purge", stats.purge.clear(), i64),
|
||||||
("purge_count", stats.purge_count.clear(), i64),
|
("purge_count", stats.purge_count.clear(), i64),
|
||||||
(
|
(
|
||||||
|
|
|
@ -50,22 +50,12 @@ impl CrdsGossip {
|
||||||
from: &Pubkey,
|
from: &Pubkey,
|
||||||
values: Vec<CrdsValue>,
|
values: Vec<CrdsValue>,
|
||||||
now: u64,
|
now: u64,
|
||||||
) -> (usize, HashSet<Pubkey>) {
|
) -> HashSet<Pubkey> {
|
||||||
let results = self
|
self.push
|
||||||
.push
|
.process_push_message(&self.crds, from, values, now)
|
||||||
.process_push_message(&self.crds, from, values, now);
|
|
||||||
let mut success_count = 0;
|
|
||||||
let successfully_inserted_origin_set: HashSet<Pubkey> = results
|
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.filter_map(|result| {
|
.filter_map(Result::ok)
|
||||||
if result.is_ok() {
|
.collect()
|
||||||
success_count += 1;
|
|
||||||
}
|
|
||||||
Result::ok(result)
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
(success_count, successfully_inserted_origin_set)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Remove redundant paths in the network.
|
/// Remove redundant paths in the network.
|
||||||
|
|
|
@ -365,7 +365,6 @@ fn network_run_push(
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.gossip
|
.gossip
|
||||||
.process_push_message(&from, msgs.clone(), now)
|
.process_push_message(&from, msgs.clone(), now)
|
||||||
.1
|
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.collect();
|
.collect();
|
||||||
let prunes_map = network
|
let prunes_map = network
|
||||||
|
|
Loading…
Reference in New Issue