gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add compact_cf calls to reclaim storage during ledger slot purge (#7264)

Browse Source
This commit is contained in:
Sunny Gleason
2019-12-18 10:29:46 -05:00
committed by GitHub
parent e16ccf8cf8
commit 323673c3c0
3 changed files with 98 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ledger/src/blocktree.rs
View File

@ -275,8 +275,8 @@ impl Blocktree {
// Returns whether or not all iterators have reached their end
fn run_purge_batch(&self, from_slot: Slot, batch_end: Slot) -> Result<bool> {
let from_slot = Some(from_slot);
let batch_end = Some(batch_end);
let some_from_slot = Some(from_slot);
let some_batch_end = Some(batch_end);
let mut write_batch = self
.db
@ -284,40 +284,77 @@ impl Blocktree {
.expect("Database Error: Failed to get write batch");
let end = self
.meta_cf
.delete_slot(&mut write_batch, from_slot, batch_end)
.delete_slot(&mut write_batch, some_from_slot, some_batch_end)
.unwrap_or(false)
& self
.meta_cf
.compact_range(from_slot, batch_end)
.unwrap_or(false)
& self
.erasure_meta_cf
.delete_slot(&mut write_batch, from_slot, batch_end)
.delete_slot(&mut write_batch, some_from_slot, some_batch_end)
.unwrap_or(false)
& self
.erasure_meta_cf
.compact_range(from_slot, batch_end)
.unwrap_or(false)
& self
.data_shred_cf
.delete_slot(&mut write_batch, from_slot, batch_end)
.delete_slot(&mut write_batch, some_from_slot, some_batch_end)
.unwrap_or(false)
& self
.data_shred_cf
.compact_range(from_slot, batch_end)
.unwrap_or(false)
& self
.code_shred_cf
.delete_slot(&mut write_batch, from_slot, batch_end)
.delete_slot(&mut write_batch, some_from_slot, some_batch_end)
.unwrap_or(false)
& self
.code_shred_cf
.compact_range(from_slot, batch_end)
.unwrap_or(false)
& self
.transaction_status_cf
.delete_slot(&mut write_batch, from_slot, batch_end)
.delete_slot(&mut write_batch, some_from_slot, some_batch_end)
.unwrap_or(false)
& self
.transaction_status_cf
.compact_range(from_slot, batch_end)
.unwrap_or(false)
& self
.orphans_cf
.delete_slot(&mut write_batch, from_slot, batch_end)
.delete_slot(&mut write_batch, some_from_slot, some_batch_end)
.unwrap_or(false)
& self
.orphans_cf
.compact_range(from_slot, batch_end)
.unwrap_or(false)
& self
.index_cf
.delete_slot(&mut write_batch, from_slot, batch_end)
.delete_slot(&mut write_batch, some_from_slot, some_batch_end)
.unwrap_or(false)
& self
.index_cf
.compact_range(from_slot, batch_end)
.unwrap_or(false)
& self
.dead_slots_cf
.delete_slot(&mut write_batch, from_slot, batch_end)
.delete_slot(&mut write_batch, some_from_slot, some_batch_end)
.unwrap_or(false)
& self
.dead_slots_cf
.compact_range(from_slot, batch_end)
.unwrap_or(false)
& self
.db
.column::<cf::Root>()
.delete_slot(&mut write_batch, from_slot, batch_end)
.delete_slot(&mut write_batch, some_from_slot, some_batch_end)
.unwrap_or(false)
& self
.db
.column::<cf::Root>()
.compact_range(from_slot, batch_end)
.unwrap_or(false);
if let Err(e) = self.db.write(write_batch) {

11
ledger/src/blocktree_db.rs
View File

@ -641,6 +641,17 @@ where
Ok(end)
}
pub fn compact_range(&self, from: Slot, to: Slot) -> Result<bool>
where
C::Index: PartialOrd + Copy,
{
let cf = self.handle();
let from = Some(C::key(C::as_index(from)));
let to = Some(C::key(C::as_index(to)));
self.backend.0.compact_range_cf(cf, from, to);
Ok(true)
}
#[inline]
pub fn handle(&self) -> &ColumnFamily {
self.backend.cf_handle(C::NAME)