Purge expired BlockHeight data from blockstore (backport #17634) (#17640

) * Purge expired BlockHeight data from blockstore (#17634) * Purge expired BlockHeight data from blockstore * Also call compact_storage and add comment.... (cherry picked from commit 96cdbfd) # Conflicts: # ledger/src/blockstore_db.rs * Fix conflict Co-authored-by: Ryo Onodera <ryoqun@gmail.com> Co-authored-by: Tyera Eulberg <tyera@solana.com>
solana-labs · Jun 2, 2021 · 0e3131f · 0e3131f
1 parent 2799765
commit 0e3131f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/ledger/src/blockstore/blockstore_purge.rs b/ledger/src/blockstore/blockstore_purge.rs
@@ -165,6 +165,10 @@ impl Blockstore {
             & self
                 .db
                 .delete_range_cf::<cf::PerfSamples>(&mut write_batch, from_slot, to_slot)
+                .is_ok()
+            & self
+                .db
+                .delete_range_cf::<cf::BlockHeight>(&mut write_batch, from_slot, to_slot)
                 .is_ok();
         let mut w_active_transaction_status_index =
             self.active_transaction_status_index.write().unwrap();
@@ -263,6 +267,10 @@ impl Blockstore {
             && self
                 .perf_samples_cf
                 .compact_range(from_slot, to_slot)
+                .unwrap_or(false)
+            && self
+                .block_height_cf
+                .compact_range(from_slot, to_slot)
                 .unwrap_or(false);
         compact_timer.stop();
         if !result {

diff --git a/ledger/src/blockstore_db.rs b/ledger/src/blockstore_db.rs
@@ -267,6 +267,8 @@ impl Rocks {
             ColumnFamilyDescriptor::new(PerfSamples::NAME, get_cf_options(&access_type));
         let block_height_cf_descriptor =
             ColumnFamilyDescriptor::new(BlockHeight::NAME, get_cf_options(&access_type));
+        // Don't forget to add to both run_purge_with_stats() and
+        // compact_storage() in ledger/src/blockstore/blockstore_purge.rs!!
 
         let cfs = vec![
             (SlotMeta::NAME, meta_cf_descriptor),