Handle errors on replaying ledger properly (bp #7741) (#7755)

automerge
solana-labs · Jan 10, 2020 · 5b006eb · 5b006eb
1 parent 32a728d
commit 5b006eb
Show file tree

Hide file tree

Showing 3 changed files with 205 additions and 72 deletions.
diff --git a/ledger/src/blocktree.rs b/ledger/src/blocktree.rs
@@ -1427,6 +1427,9 @@ impl Blocktree {
         slot: Slot,
         start_index: u64,
     ) -> Result<(Vec<Entry>, usize, bool)> {
+        if self.is_dead(slot) {
+            return Err(BlocktreeError::DeadSlot);
+        }
         let slot_meta_cf = self.db.column::<cf::SlotMeta>();
         let slot_meta = slot_meta_cf.get(slot)?;
         if slot_meta.is_none() {

diff --git a/ledger/src/blocktree_db.rs b/ledger/src/blocktree_db.rs
@@ -41,6 +41,7 @@ pub enum BlocktreeError {
     InvalidShredData(Box<bincode::ErrorKind>),
     RocksDb(#[from] rocksdb::Error),
     SlotNotRooted,
+    DeadSlot,
     IO(#[from] std::io::Error),
     Serialize(#[from] Box<bincode::ErrorKind>),
     FsExtraError(#[from] fs_extra::error::Error),