Add get_incremental_snapshot_hash_for_node() to gossip

Fixes #20377
solana-labs · Oct 3, 2021 · 9e25662 · 9e25662
1 parent 490fc04
commit 9e25662
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/gossip/src/cluster_info.rs b/gossip/src/cluster_info.rs
@@ -23,8 +23,8 @@ use {
         crds_gossip_error::CrdsGossipError,
         crds_gossip_pull::{CrdsFilter, ProcessPullStats, CRDS_GOSSIP_PULL_CRDS_TIMEOUT_MS},
         crds_value::{
-            self, CrdsData, CrdsValue, CrdsValueLabel, EpochSlotsIndex, LowestSlot, NodeInstance,
-            SnapshotHash, Version, Vote, MAX_WALLCLOCK,
+            self, CrdsData, CrdsValue, CrdsValueLabel, EpochSlotsIndex, IncrementalSnapshotHash,
+            LowestSlot, NodeInstance, SnapshotHash, Version, Vote, MAX_WALLCLOCK,
         },
         epoch_slots::EpochSlots,
         gossip_error::GossipError,
@@ -1115,6 +1115,18 @@ impl ClusterInfo {
         Some(map(hashes))
     }
 
+    pub fn get_incremental_snapshot_hash_for_node<F, Y>(&self, pubkey: &Pubkey, map: F) -> Option<Y>
+    where
+        F: FnOnce((Slot, &Vec<(Slot, Hash)>)) -> Y,
+    {
+        let gossip_crds = self.gossip.crds.read().unwrap();
+        let incremental_snapshot_hash = gossip_crds.get::<&IncrementalSnapshotHash>(*pubkey)?;
+        Some(map((
+            incremental_snapshot_hash.base_slot,
+            &incremental_snapshot_hash.hashes,
+        )))
+    }
+
     /// Returns epoch-slots inserted since the given cursor.
     /// Excludes entries from nodes with unkown or different shred version.
     pub fn get_epoch_slots(&self, cursor: &mut Cursor) -> Vec<EpochSlots> {

diff --git a/gossip/src/crds_entry.rs b/gossip/src/crds_entry.rs
@@ -3,7 +3,8 @@ use {
         contact_info::ContactInfo,
         crds::VersionedCrdsValue,
         crds_value::{
-            CrdsData, CrdsValue, CrdsValueLabel, LegacyVersion, LowestSlot, SnapshotHash, Version,
+            CrdsData, CrdsValue, CrdsValueLabel, IncrementalSnapshotHash, LegacyVersion,
+            LowestSlot, SnapshotHash, Version,
         },
     },
     indexmap::IndexMap,
@@ -68,6 +69,19 @@ impl<'a, 'b> CrdsEntry<'a, 'b> for &'a SnapshotHash {
     }
 }
 
+impl<'a, 'b> CrdsEntry<'a, 'b> for &'a IncrementalSnapshotHash {
+    type Key = Pubkey;
+    fn get_entry(table: &'a CrdsTable, key: Self::Key) -> Option<Self> {
+        let key = CrdsValueLabel::IncrementalSnapshotHashes(key);
+        match &table.get(&key)?.value.data {
+            CrdsData::IncrementalSnapshotHashes(incremental_snapshot_hash) => {
+                Some(incremental_snapshot_hash)
+            }
+            _ => None,
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use {