Add metric measuring number of successfully inserted push messages (#…

…20275)

* Add number of successfully inserted push messages

(cherry picked from commit ee8621a)

gossip/src/cluster_info.rs

@@ -2209,7 +2209,12 @@ impl ClusterInfo {
             messages
                 .into_iter()
                 .flat_map(|(from, crds_values)| {
-                    gossip.process_push_message(&from, crds_values, now)
+                    let (num_success, origins) =
+                        gossip.process_push_message(&from, crds_values, now);
+                    self.stats
+                        .process_push_success
+                        .add_relaxed(num_success as u64);
+                    origins
                 })
                 .collect()
         };

gossip/src/cluster_info_metrics.rs

@@ -134,6 +134,7 @@ pub(crate) struct GossipStats {
     pub(crate) process_pull_response_success: Counter,
     pub(crate) process_pull_response_timeout: Counter,
     pub(crate) process_push_message: Counter,
+    pub(crate) process_push_success: Counter,
     pub(crate) prune_message_count: Counter,
     pub(crate) prune_message_len: Counter,
     pub(crate) prune_received_cache: Counter,
@@ -203,6 +204,11 @@ pub(crate) fn submit_gossip_stats(
         ("repair_peers", stats.repair_peers.clear(), i64),
         ("new_push_requests", stats.new_push_requests.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),
         (
             "process_gossip_packets_time",

gossip/src/crds_gossip.rs

@@ -48,17 +48,21 @@ impl CrdsGossip {
         from: &Pubkey,
         values: Vec<CrdsValue>,
         now: u64,
-    ) -> HashSet<Pubkey> {
-        values
+    ) -> (usize, HashSet<Pubkey>) {
+        let mut success_count = 0;
+        let successfully_inserted_origin_set: HashSet<Pubkey> = values
             .into_iter()
             .filter_map(|val| {
                 let origin = val.pubkey();
                 self.push
                     .process_push_message(&mut self.crds, from, val, now)
                     .ok()?;
+                success_count += 1;
                 Some(origin)
             })
-            .collect()
+            .collect();
+
+        (success_count, successfully_inserted_origin_set)
     }
 
     /// remove redundant paths in the network

gossip/tests/crds_gossip.rs

@@ -349,6 +349,7 @@ fn network_run_push(
                         .lock()
                         .unwrap()
                         .process_push_message(&from, msgs.clone(), now)
+                        .1
                         .into_iter()
                         .collect();
                     let prunes_map = network

upload-perf/src/upload-perf.rs

@@ -74,7 +74,6 @@ fn main() {
                         ("commit", git_commit_hash.trim().to_string(), String)
                     );
                     */
-
                 }
                 let last_median =
                     get_last_metrics(&"median".to_string(), &db, &name, branch).unwrap_or_default();