Add StatusCache::root_slot_deltas() and use it

core/tests/snapshots.rs

@@ -281,11 +281,17 @@ mod tests {
         let last_bank_snapshot_info =
             snapshot_utils::get_highest_bank_snapshot_pre(bank_snapshots_dir)
                 .expect("no bank snapshots found in path");
+        let slot_deltas = last_bank
+            .src
+            .status_cache
+            .read()
+            .unwrap()
+            .root_slot_deltas();
         let accounts_package = AccountsPackage::new(
             &last_bank,
             &last_bank_snapshot_info,
             bank_snapshots_dir,
-            last_bank.src.slot_deltas(&last_bank.src.roots()),
+            slot_deltas,
             &snapshot_config.full_snapshot_archives_dir,
             &snapshot_config.incremental_snapshot_archives_dir,
             last_bank.get_snapshot_storages(None),
@@ -626,7 +632,13 @@ mod tests {
                 .get(snapshot_test_config.bank_forks.root())
                 .unwrap()
                 .src
-                .roots();
+                .status_cache
+                .read()
+                .unwrap()
+                .roots()
+                .iter()
+                .cloned()
+                .sorted();
             assert!(slots_to_snapshot.into_iter().eq(expected_slots_to_snapshot));
         }
     }

runtime/benches/status_cache.rs

@@ -47,3 +47,19 @@ fn bench_status_cache_slot_deltas(bencher: &mut Bencher) {
 
     bencher.iter(|| test::black_box(status_cache.slot_deltas(&slots)));
 }
+
+#[bench]
+fn bench_status_cache_root_slot_deltas(bencher: &mut Bencher) {
+    let mut status_cache = BankStatusCache::default();
+
+    // fill the status cache
+    let slots: Vec<_> = (42..).take(MAX_CACHE_ENTRIES).collect();
+    for slot in &slots {
+        for _ in 0..5 {
+            status_cache.insert(&Hash::new_unique(), Hash::new_unique(), *slot, Ok(()));
+        }
+        status_cache.add_root(*slot);
+    }
+
+    bencher.iter(|| test::black_box(status_cache.root_slot_deltas()));
+}

runtime/src/bank.rs

@@ -595,24 +595,6 @@ pub struct StatusCacheRc {
     pub status_cache: Arc<RwLock<BankStatusCache>>,
 }
 
-impl StatusCacheRc {
-    pub fn slot_deltas(&self, slots: &[Slot]) -> Vec<BankSlotDelta> {
-        let sc = self.status_cache.read().unwrap();
-        sc.slot_deltas(slots)
-    }
-
-    pub fn roots(&self) -> Vec<Slot> {
-        self.status_cache
-            .read()
-            .unwrap()
-            .roots()
-            .iter()
-            .cloned()
-            .sorted()
-            .collect()
-    }
-}
-
 pub type TransactionCheckResult = (Result<()>, Option<NoncePartial>);
 
 pub struct TransactionResults {

runtime/src/bank_forks.rs

@@ -278,13 +278,18 @@ impl BankForks {
                 {
                     let snapshot_root_bank = self.root_bank();
                     let root_slot = snapshot_root_bank.slot();
+                    // Save off the status cache because these may get pruned if another
+                    // `set_root()` is called before the snapshots package can be generated
+                    let status_cache_slot_deltas = snapshot_root_bank
+                        .src
+                        .status_cache
+                        .read()
+                        .unwrap()
+                        .root_slot_deltas();
                     if let Err(e) =
                         accounts_background_request_sender.send_snapshot_request(SnapshotRequest {
                             snapshot_root_bank,
-                            // Save off the status cache because these may get pruned
-                            // if another `set_root()` is called before the snapshots package
-                            // can be generated
-                            status_cache_slot_deltas: bank.src.slot_deltas(&bank.src.roots()),
+                            status_cache_slot_deltas,
                         })
                     {
                         warn!(

runtime/src/snapshot_utils.rs

@@ -1949,11 +1949,12 @@ pub fn package_and_archive_full_snapshot(
     maximum_full_snapshot_archives_to_retain: usize,
     maximum_incremental_snapshot_archives_to_retain: usize,
 ) -> Result<FullSnapshotArchiveInfo> {
+    let slot_deltas = bank.src.status_cache.read().unwrap().root_slot_deltas();
     let accounts_package = AccountsPackage::new(
         bank,
         bank_snapshot_info,
         bank_snapshots_dir,
-        bank.src.slot_deltas(&bank.src.roots()),
+        slot_deltas,
         &full_snapshot_archives_dir,
         &incremental_snapshot_archives_dir,
         snapshot_storages,
@@ -1998,11 +1999,12 @@ pub fn package_and_archive_incremental_snapshot(
     maximum_full_snapshot_archives_to_retain: usize,
     maximum_incremental_snapshot_archives_to_retain: usize,
 ) -> Result<IncrementalSnapshotArchiveInfo> {
+    let slot_deltas = bank.src.status_cache.read().unwrap().root_slot_deltas();
     let accounts_package = AccountsPackage::new(
         bank,
         bank_snapshot_info,
         bank_snapshots_dir,
-        bank.src.slot_deltas(&bank.src.roots()),
+        slot_deltas,
         &full_snapshot_archives_dir,
         &incremental_snapshot_archives_dir,
         snapshot_storages,

runtime/src/status_cache.rs

@@ -47,7 +47,7 @@ impl<T: Serialize + Clone> Default for StatusCache<T> {
         Self {
             cache: HashMap::default(),
             // 0 is always a root
-            roots: [0].iter().cloned().collect(),
+            roots: HashSet::from([0]),
             slot_deltas: HashMap::default(),
         }
     }
@@ -230,7 +230,21 @@ impl<T: Serialize + Clone> StatusCache<T> {
                 (
                     *slot,
                     self.roots.contains(slot),
-                    self.slot_deltas.get(slot).unwrap_or(&empty).clone(),
+                    Arc::clone(self.slot_deltas.get(slot).unwrap_or(&empty)),
+                )
+            })
+            .collect()
+    }
+
+    /// Get the statuses for all the root slots
+    pub fn root_slot_deltas(&self) -> Vec<SlotDelta<T>> {
+        self.roots
+            .iter()
+            .map(|slot| {
+                (
+                    *slot,
+                    true,
+                    self.slot_deltas.get(slot).cloned().unwrap_or_default(),
                 )
             })
             .collect()
@@ -450,7 +464,7 @@ mod tests {
         for i in 0..(MAX_CACHE_ENTRIES + 1) {
             status_cache.add_root(i as u64);
         }
-        let slots: Vec<_> = (0_u64..MAX_CACHE_ENTRIES as u64 + 1).collect();
+        let slots: Vec<_> = (0..MAX_CACHE_ENTRIES as u64 + 1).collect();
         assert_eq!(status_cache.slot_deltas.len(), 1);
         assert!(status_cache.slot_deltas.get(&1).is_some());
         let slot_deltas = status_cache.slot_deltas(&slots);