blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add logging surrounding failure in `get_slot_entries_with_shred_info()` (#7846) 

* Add logging surrounding failure
This commit is contained in:
carllin 2020-01-16 16:03:24 -08:00 committed by GitHub
parent 76e20015a4
commit 0526d4ff21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ledger/src/blockstore.rs
View File

@ -1506,7 +1506,7 @@ impl Blockstore {
completed_ranges completed_ranges
.par_iter() .par_iter()
.map(|(start_index, end_index)| { .map(|(start_index, end_index)| {
self.get_entries_in_data_block(slot, *start_index, *end_index) self.get_entries_in_data_block(slot, *start_index, *end_index, &slot_meta)
}) })
.collect() .collect()
}) })
@ -1547,6 +1547,7 @@ impl Blockstore {
slot: Slot, slot: Slot,
start_index: u32, start_index: u32,
end_index: u32, end_index: u32,
slot_meta: &SlotMeta,
) -> Result<Vec<Entry>> { ) -> Result<Vec<Entry>> {
let data_shred_cf = self.db.column::<cf::ShredData>(); let data_shred_cf = self.db.column::<cf::ShredData>();
@ -1556,10 +1557,22 @@ impl Blockstore {
data_shred_cf data_shred_cf
.get_bytes((slot, u64::from(i))) .get_bytes((slot, u64::from(i)))
.and_then(|serialized_shred| { .and_then(|serialized_shred| {
Shred::new_from_serialized_shred( Shred::new_from_serialized_shred(serialized_shred.unwrap_or_else(|| {
serialized_shred panic!(
.expect("Shred must exist if shred index was included in a range"), "Shred with
) slot: {},
index: {},
consumed: {},
completed_indexes: {:?}
must exist if shred index was included in a range: {} {}",
slot,
i,
slot_meta.consumed,
slot_meta.completed_data_indexes,
start_index,
end_index
)
}))
.map_err(|err| { .map_err(|err| {
BlockstoreError::InvalidShredData(Box::new(bincode::ErrorKind::Custom( BlockstoreError::InvalidShredData(Box::new(bincode::ErrorKind::Custom(
format!( format!(