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

Save fetching state for blobs pruning

Browse Source
This commit is contained in:
Emilia Hane 2023-01-13 22:09:15 +01:00
parent 6f5ca02ac9
commit a2b8c6ee69
No known key found for this signature in database
GPG Key ID: E73394F9C09206FA
3 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/beacon_chain/src/beacon_chain.rs
View File

@ -612,10 +612,10 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
start_slot, start_slot,
end_slot, end_slot,
|| { || {
( Ok((
head.beacon_state.clone_with_only_committee_caches(), head.beacon_state.clone_with_only_committee_caches(),
head.beacon_block_root, head.beacon_block_root,
) ))
}, },
&self.spec, &self.spec,
)?; )?;
@ -709,10 +709,10 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
start_slot, start_slot,
end_slot, end_slot,
|| { || {
( Ok((
head.beacon_state.clone_with_only_committee_caches(), head.beacon_state.clone_with_only_committee_caches(),
head.beacon_state_root(), head.beacon_state_root(),
) ))
}, },
&self.spec, &self.spec,
)?; )?;

6
beacon_node/store/src/forwards_iter.rs
View File

@ -150,7 +150,7 @@ impl<'a, E: EthSpec, F: Root<E>, Hot: ItemStore<E>, Cold: ItemStore<E>>
store: &'a HotColdDB<E, Hot, Cold>, store: &'a HotColdDB<E, Hot, Cold>,
start_slot: Slot, start_slot: Slot,
end_slot: Option<Slot>, end_slot: Option<Slot>,
get_state: impl FnOnce() -> (BeaconState<E>, Hash256), get_state: impl FnOnce() -> Result<(BeaconState<E>, Hash256)>,
spec: &ChainSpec, spec: &ChainSpec,
) -> Result<Self> { ) -> Result<Self> {
use HybridForwardsIterator::*; use HybridForwardsIterator::*;
@ -172,7 +172,7 @@ impl<'a, E: EthSpec, F: Root<E>, Hot: ItemStore<E>, Cold: ItemStore<E>>
if end_slot.map_or(false, |end_slot| end_slot < latest_restore_point_slot) { if end_slot.map_or(false, |end_slot| end_slot < latest_restore_point_slot) {
None None
} else { } else {
Some(Box::new(get_state())) Some(Box::new(get_state()?))
}; };
PreFinalization { PreFinalization {
iter, iter,
@ -180,7 +180,7 @@ impl<'a, E: EthSpec, F: Root<E>, Hot: ItemStore<E>, Cold: ItemStore<E>>
} }
} else { } else {
PostFinalizationLazy { PostFinalizationLazy {
continuation_data: Some(Box::new(get_state())), continuation_data: Some(Box::new(get_state()?)),
store, store,
start_slot, start_slot,
} }

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

@ -657,7 +657,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
self, self,
start_slot, start_slot,
None, None,
|| (end_state, end_block_root), || Ok((end_state, end_block_root)),
spec, spec,
) )
} }
@ -666,7 +666,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
&self, &self,
start_slot: Slot, start_slot: Slot,
end_slot: Slot, end_slot: Slot,
get_state: impl FnOnce() -> (BeaconState<E>, Hash256), get_state: impl FnOnce() -> Result<(BeaconState<E>, Hash256), Error>,
spec: &ChainSpec, spec: &ChainSpec,
) -> Result<HybridForwardsBlockRootsIterator<E, Hot, Cold>, Error> { ) -> Result<HybridForwardsBlockRootsIterator<E, Hot, Cold>, Error> {
HybridForwardsBlockRootsIterator::new(self, start_slot, Some(end_slot), get_state, spec) HybridForwardsBlockRootsIterator::new(self, start_slot, Some(end_slot), get_state, spec)
@ -683,7 +683,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
self, self,
start_slot, start_slot,
None, None,
|| (end_state, end_state_root), || Ok((end_state, end_state_root)),
spec, spec,
) )
} }
@ -692,7 +692,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
&self, &self,
start_slot: Slot, start_slot: Slot,
end_slot: Slot, end_slot: Slot,
get_state: impl FnOnce() -> (BeaconState<E>, Hash256), get_state: impl FnOnce() -> Result<(BeaconState<E>, Hash256), Error>,
spec: &ChainSpec, spec: &ChainSpec,
) -> Result<HybridForwardsStateRootsIterator<E, Hot, Cold>, Error> { ) -> Result<HybridForwardsStateRootsIterator<E, Hot, Cold>, Error> {
HybridForwardsStateRootsIterator::new(self, start_slot, Some(end_slot), get_state, spec) HybridForwardsStateRootsIterator::new(self, start_slot, Some(end_slot), get_state, spec)
@ -1067,7 +1067,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
let state_root_iter = self.forwards_state_roots_iterator_until( let state_root_iter = self.forwards_state_roots_iterator_until(
low_restore_point.slot(), low_restore_point.slot(),
slot, slot,
|| (high_restore_point, Hash256::zero()), || Ok((high_restore_point, Hash256::zero())),
&self.spec, &self.spec,
)?; )?;
@ -1694,9 +1694,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
/// Try to prune blobs older than the data availability boundary. /// Try to prune blobs older than the data availability boundary.
pub fn try_prune_blobs(&self, force: bool) -> Result<(), Error> { pub fn try_prune_blobs(&self, force: bool) -> Result<(), Error> {
let blob_info = match self.get_blob_info() { let blob_info = match self.get_blob_info() {
Some(old_blob_info) => { Some(old_blob_info) => old_blob_info,
old_blob_info
}
None => { None => {
return Ok(()); return Ok(());
} }
@ -1709,14 +1707,6 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
let dab_state_root = blob_info.data_availability_boundary.state_root; let dab_state_root = blob_info.data_availability_boundary.state_root;
// Load the state from which to prune blobs so we can backtrack.
let dab_state = self
.get_state(&dab_state_root, None)?
.ok_or(HotColdDBError::MissingStateToPruneBlobs(dab_state_root))?;
let dab_block_root = dab_state.get_latest_block_root(dab_state_root);
let dab_slot = dab_state.slot();
// Iterate block roots backwards to oldest blob slot. // Iterate block roots backwards to oldest blob slot.
warn!( warn!(
self.log, self.log,
@ -1727,9 +1717,19 @@ 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 std::iter::once(Ok((dab_block_root, dab_slot))) for res in self.forwards_block_roots_iterator_until(
.chain(BlockRootsIterator::new(self, &dab_state)) blob_info.oldest_blob_slot,
{ blob_info.data_availability_boundary.slot,
|| {
let dab_state = self
.get_state(&dab_state_root, None)?
.ok_or(HotColdDBError::MissingStateToPruneBlobs(dab_state_root))?;
let dab_block_root = dab_state.get_latest_block_root(dab_state_root);
Ok((dab_state, dab_block_root))
},
&self.spec,
)? {
let (block_root, slot) = match res { let (block_root, slot) = match res {
Ok(tuple) => tuple, Ok(tuple) => tuple,
Err(e) => { Err(e) => {
@ -1761,7 +1761,6 @@ 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 = dab_slot + 1;
break; break;
} }
} }
@ -1774,8 +1773,12 @@ 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 = dab_state.current_epoch(); if let Some(mut new_blob_info) = self.get_blob_info() {
self.compare_and_set_blob_info_with_write(self.get_blob_info(), Some(blob_info))?; new_blob_info.last_pruned_epoch =
(blob_info.data_availability_boundary.slot + 1).epoch(E::slots_per_epoch());
new_blob_info.oldest_blob_slot = blob_info.data_availability_boundary.slot + 1;
self.compare_and_set_blob_info_with_write(self.get_blob_info(), Some(new_blob_info))?;
}
Ok(()) Ok(())
} }