From 5c86f89bc71c3be677bb1e3f0c38df2d4bfd7108 Mon Sep 17 00:00:00 2001
From: Greg Cusack <greg.cusack@solana.com>
Date: Mon, 7 Aug 2023 11:40:18 -0700
Subject: [PATCH] Add from field for message tracking (#32725)

* we only want to report received message signatures on PUSH requests, not PULL requests

* woops accidently had it has LocalMessage not PushMessage

* switch from match to if let statement

* convert if let to matches macro

* add in from field in PushMessage for message tracking

* update with cargo fmt

* remove display for gossip route and add lifetime param to pubkey reference in gossiproute enum

* forgot to run fmt
---
 gossip/src/crds.rs             | 23 +++++++++++++++--------
 gossip/src/crds_gossip_push.rs |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/gossip/src/crds.rs b/gossip/src/crds.rs
index 1dc7f9509..b98c02535 100644
--- a/gossip/src/crds.rs
+++ b/gossip/src/crds.rs
@@ -96,11 +96,11 @@ pub enum CrdsError {
 }
 
 #[derive(Clone, Copy)]
-pub enum GossipRoute {
+pub enum GossipRoute<'a> {
     LocalMessage,
     PullRequest,
     PullResponse,
-    PushMessage,
+    PushMessage(/*from:*/ &'a Pubkey),
 }
 
 type CrdsCountsArray = [usize; 12];
@@ -301,7 +301,7 @@ impl Crds {
                 if entry.get().value_hash != value.value_hash {
                     self.purged.push_back((value.value_hash, now));
                     Err(CrdsError::InsertFailed)
-                } else if matches!(route, GossipRoute::PushMessage) {
+                } else if matches!(route, GossipRoute::PushMessage(_)) {
                     let entry = entry.get_mut();
                     entry.num_push_dups = entry.num_push_dups.saturating_add(1);
                     Err(CrdsError::DuplicatePush(entry.num_push_dups))
@@ -678,9 +678,11 @@ impl CrdsDataStats {
             }
         }
 
-        if matches!(route, GossipRoute::PushMessage)
-            && should_report_message_signature(&entry.value.signature)
-        {
+        let GossipRoute::PushMessage(from) = route else {
+            return;
+        };
+
+        if should_report_message_signature(&entry.value.signature) {
             datapoint_info!(
                 "gossip_crds_sample",
                 (
@@ -692,6 +694,11 @@ impl CrdsDataStats {
                     "signature",
                     entry.value.signature.to_string().get(..8),
                     Option<String>
+                ),
+                (
+                    "from",
+                    from.to_string().get(..8),
+                    Option<String>
                 )
             );
         }
@@ -725,7 +732,7 @@ impl CrdsStats {
         match route {
             GossipRoute::LocalMessage => (),
             GossipRoute::PullRequest => (),
-            GossipRoute::PushMessage => self.push.record_insert(entry, route),
+            GossipRoute::PushMessage(_) => self.push.record_insert(entry, route),
             GossipRoute::PullResponse => self.pull.record_insert(entry, route),
         }
     }
@@ -734,7 +741,7 @@ impl CrdsStats {
         match route {
             GossipRoute::LocalMessage => (),
             GossipRoute::PullRequest => (),
-            GossipRoute::PushMessage => self.push.record_fail(entry),
+            GossipRoute::PushMessage(_) => self.push.record_fail(entry),
             GossipRoute::PullResponse => self.pull.record_fail(entry),
         }
     }
diff --git a/gossip/src/crds_gossip_push.rs b/gossip/src/crds_gossip_push.rs
index 447257603..345c9eaf1 100644
--- a/gossip/src/crds_gossip_push.rs
+++ b/gossip/src/crds_gossip_push.rs
@@ -144,7 +144,7 @@ impl CrdsGossipPush {
                     continue;
                 }
                 let origin = value.pubkey();
-                match crds.insert(value, now, GossipRoute::PushMessage) {
+                match crds.insert(value, now, GossipRoute::PushMessage(&from)) {
                     Ok(()) => {
                         received_cache.record(origin, from, /*num_dups:*/ 0);
                         origins.insert(origin);