cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fixup! Prune blobs before data availability breakpoint

Browse Source
This commit is contained in:
Emilia Hane 2023-01-09 11:11:36 +01:00
parent 934f3ab587
commit d3b94d8617
No known key found for this signature in database
GPG Key ID: E73394F9C09206FA
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
beacon_node/store/src/hot_cold_store.rs
View File

@ -1712,13 +1712,13 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
} }
// Load the state from which to prune blobs so we can backtrack. // Load the state from which to prune blobs so we can backtrack.
let erase_state = self.get_state(&data_availability_breakpoint, None)?.ok_or( let prune_state = self.get_state(&data_availability_breakpoint, None)?.ok_or(
HotColdDBError::MissingStateToPruneBlobs(data_availability_breakpoint), HotColdDBError::MissingStateToPruneBlobs(data_availability_breakpoint),
)?; )?;
// The data availability breakpoint is set at the start of an epoch indicating the epoch // The data_availability_breakpoint is set at the start of an epoch indicating the epoch
// before can be pruned. // before can be pruned.
let erase_epoch = erase_state.current_epoch() - 1; let prune_epoch = prune_state.current_epoch() - 1;
// The finalized block may or may not have its blobs sidecar stored, depending on // The finalized block may or may not have its blobs sidecar stored, depending on
// whether it was at a skipped slot. However for a fully pruned database its parent // whether it was at a skipped slot. However for a fully pruned database its parent
@ -1726,7 +1726,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
// parent block with at least one kzg commitment. // parent block with at least one kzg commitment.
let already_pruned = process_results( let already_pruned = process_results(
BlockRootsIter::new(&erase_state, blob_info.oldest_blob_slot), BlockRootsIter::new(&prune_state, blob_info.oldest_blob_slot),
|mut iter| { |mut iter| {
iter.find(|(_, block_root)| { iter.find(|(_, block_root)| {
move || -> bool { move || -> bool {
@ -1764,7 +1764,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
let mut ops = vec![]; let mut ops = vec![];
let mut last_pruned_block_root = None; let mut last_pruned_block_root = None;
for res in BlockRootsIterator::new(self, &erase_state) { for res in BlockRootsIterator::new(self, &prune_state) {
let (block_root, slot) = match res { let (block_root, slot) = match res {
Ok(tuple) => tuple, Ok(tuple) => tuple,
Err(e) => { Err(e) => {
@ -1796,6 +1796,9 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
"Blobs sidecar pruning reached earliest available blobs sidecar"; "Blobs sidecar pruning reached earliest available blobs sidecar";
"slot" => slot "slot" => slot
); );
blob_info.oldest_blob_slot = slot;
blob_info.last_pruned_epoch = prune_epoch;
blob_info.oldest_blob_parent = data_availability_breakpoint;
break; break;
} }
} }
@ -1808,8 +1811,6 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
"blobs_sidecars_pruned" => blobs_sidecars_pruned, "blobs_sidecars_pruned" => blobs_sidecars_pruned,
); );
blob_info.last_pruned_epoch = erase_epoch;
blob_info.oldest_blob_parent = data_availability_breakpoint;
self.compare_and_set_blob_info_with_write(self.get_blob_info(), Some(blob_info))?; self.compare_and_set_blob_info_with_write(self.get_blob_info(), Some(blob_info))?;
Ok(()) Ok(())