Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v1.18: add metric for duplicate push messages (backport of #321) #505

Merged
merged 1 commit into from
Mar 29, 2024
Merged

v1.18: add metric for duplicate push messages (backport of #321) #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions gossip/src/cluster_info_metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,11 @@ pub(crate) fn submit_gossip_stats(
i64
),
("push_message_count", stats.push_message_count.clear(), i64),
(
"num_duplicate_push_messages",
crds_stats.num_duplicate_push_messages,
i64
),
(
"push_fanout_num_entries",
stats.push_fanout_num_entries.clear(),
Expand Down
12 changes: 8 additions & 4 deletions gossip/src/crds.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ pub(crate) struct CrdsStats {
/// number of times a message was first received via a PullResponse
/// and that message was later received via a PushMessage
pub(crate) num_redundant_pull_responses: u64,
pub(crate) num_duplicate_push_messages: u64,
}

/// This structure stores some local metadata associated with the CrdsValue
Expand Down Expand Up @@ -235,9 +236,10 @@ impl Crds {
let label = value.label();
let pubkey = value.pubkey();
let value = VersionedCrdsValue::new(value, self.cursor, now, route);
let mut stats = self.stats.lock().unwrap();
match self.table.entry(label) {
Entry::Vacant(entry) => {
self.stats.lock().unwrap().record_insert(&value, route);
stats.record_insert(&value, route);
let entry_index = entry.index();
self.shards.insert(entry_index, &value);
match &value.value.data {
Expand All @@ -263,7 +265,7 @@ impl Crds {
Ok(())
}
Entry::Occupied(mut entry) if overrides(&value.value, entry.get()) => {
self.stats.lock().unwrap().record_insert(&value, route);
stats.record_insert(&value, route);
let entry_index = entry.index();
self.shards.remove(entry_index, entry.get());
self.shards.insert(entry_index, &value);
Expand Down Expand Up @@ -302,7 +304,7 @@ impl Crds {
Ok(())
}
Entry::Occupied(mut entry) => {
self.stats.lock().unwrap().record_fail(&value, route);
stats.record_fail(&value, route);
trace!(
"INSERT FAILED data: {} new.wallclock: {}",
value.value.label(),
Expand All @@ -316,7 +318,9 @@ impl Crds {
} else if matches!(route, GossipRoute::PushMessage(_)) {
let entry = entry.get_mut();
if entry.num_push_recv == Some(0) {
self.stats.lock().unwrap().num_redundant_pull_responses += 1;
stats.num_redundant_pull_responses += 1;
} else {
stats.num_duplicate_push_messages += 1;
}
let num_push_dups = entry.num_push_recv.unwrap_or_default();
entry.num_push_recv = Some(num_push_dups.saturating_add(1));
Expand Down
Loading