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

Fix lowest_cleanup_slot check in Blockstore (#9382)

Browse Source 
automerge
This commit is contained in:
Tyera Eulberg
2020-04-08 19:47:16 -06:00
committed by GitHub
parent 6a2be8b0ca
commit f655b3f0fd
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ledger/src/blockstore.rs
View File

@ -1173,7 +1173,7 @@ impl Blockstore {
// lowest_cleanup_slot is the last slot that was not cleaned up by // lowest_cleanup_slot is the last slot that was not cleaned up by
// LedgerCleanupService // LedgerCleanupService
let lowest_cleanup_slot = self.lowest_cleanup_slot.read().unwrap(); let lowest_cleanup_slot = self.lowest_cleanup_slot.read().unwrap();
if *lowest_cleanup_slot > slot { if *lowest_cleanup_slot > 0 && *lowest_cleanup_slot >= slot {
return Err(BlockstoreError::SlotCleanedUp); return Err(BlockstoreError::SlotCleanedUp);
} }
let meta_cf = self.db.column::<cf::SlotMeta>(); let meta_cf = self.db.column::<cf::SlotMeta>();
@ -1420,7 +1420,7 @@ impl Blockstore {
let lowest_cleanup_slot = self.lowest_cleanup_slot.read().unwrap(); let lowest_cleanup_slot = self.lowest_cleanup_slot.read().unwrap();
// lowest_cleanup_slot is the last slot that was not cleaned up by // lowest_cleanup_slot is the last slot that was not cleaned up by
// LedgerCleanupService // LedgerCleanupService
if *lowest_cleanup_slot > slot { if *lowest_cleanup_slot > 0 && *lowest_cleanup_slot >= slot {
return Err(BlockstoreError::SlotCleanedUp); return Err(BlockstoreError::SlotCleanedUp);
} }
@ -1489,7 +1489,7 @@ impl Blockstore {
let lowest_cleanup_slot = self.lowest_cleanup_slot.read().unwrap(); let lowest_cleanup_slot = self.lowest_cleanup_slot.read().unwrap();
// lowest_cleanup_slot is the last slot that was not cleaned up by // lowest_cleanup_slot is the last slot that was not cleaned up by
// LedgerCleanupService // LedgerCleanupService
if *lowest_cleanup_slot > slot { if *lowest_cleanup_slot > 0 && *lowest_cleanup_slot >= slot {
return Err(BlockstoreError::SlotCleanedUp); return Err(BlockstoreError::SlotCleanedUp);
} }
let encoding = encoding.unwrap_or(TransactionEncoding::Json); let encoding = encoding.unwrap_or(TransactionEncoding::Json);
@ -1784,7 +1784,7 @@ impl Blockstore {
// lowest_cleanup_slot is the last slot that was not cleaned up by // lowest_cleanup_slot is the last slot that was not cleaned up by
// LedgerCleanupService // LedgerCleanupService
let lowest_cleanup_slot = self.lowest_cleanup_slot.read().unwrap(); let lowest_cleanup_slot = self.lowest_cleanup_slot.read().unwrap();
if *lowest_cleanup_slot > slot { if *lowest_cleanup_slot > 0 && *lowest_cleanup_slot >= slot {
return Err(BlockstoreError::SlotCleanedUp); return Err(BlockstoreError::SlotCleanedUp);
} }
@ -3127,6 +3127,26 @@ pub mod tests {
Blockstore::destroy(&ledger_path).expect("Expected successful database destruction"); Blockstore::destroy(&ledger_path).expect("Expected successful database destruction");
} }
#[test]
fn test_shred_cleanup_check() {
let slot = 1;
let (shreds, _) = make_slot_entries(slot, 0, 100);
let ledger_path = get_tmp_ledger_path!();
let ledger = Blockstore::open(&ledger_path).unwrap();
ledger.insert_shreds(shreds, None, false).unwrap();
let mut buf = [0; 4096];
assert!(ledger.get_data_shreds(slot, 0, 1, &mut buf).is_ok());
let max_purge_slot = 1;
ledger.run_purge(0, max_purge_slot).unwrap();
*ledger.lowest_cleanup_slot.write().unwrap() = max_purge_slot;
let mut buf = [0; 4096];
assert!(ledger.get_data_shreds(slot, 0, 1, &mut buf).is_err());
}
#[test] #[test]
fn test_insert_data_shreds_basic() { fn test_insert_data_shreds_basic() {
// Create enough entries to ensure there are at least two shreds created // Create enough entries to ensure there are at least two shreds created