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

fixup! Allow user to set an epoch margin for pruning

Browse Source
This commit is contained in:
Emilia Hane 2023-01-20 18:42:57 +01:00
parent 1812301c9c
commit 4de523fb75
No known key found for this signature in database
GPG Key ID: E73394F9C09206FA
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1780,9 +1780,22 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
// middle of an epoch otherwise the oldest blob slot is a start slot. // middle of an epoch otherwise the oldest blob slot is a start slot.
let last_pruned_epoch = oldest_blob_slot.epoch(E::slots_per_epoch()) - 1; let last_pruned_epoch = oldest_blob_slot.epoch(E::slots_per_epoch()) - 1;
// At most prune up until the data availability boundary epoch, leaving at least blobs in
// the data availability boundary epoch and younger.
let end_epoch = {
let earliest_prunable_epoch = data_availability_boundary - 1;
// Stop pruning before reaching the data availability boundary if a margin is
// configured.
if let Some(margin) = self.get_config().blob_prune_margin_epochs {
earliest_prunable_epoch - margin
} else {
earliest_prunable_epoch
}
};
if !force { if !force {
if last_pruned_epoch.as_u64() + self.get_config().epochs_per_blob_prune if last_pruned_epoch.as_u64() + self.get_config().epochs_per_blob_prune
> data_availability_boundary.as_u64() > end_epoch.as_u64()
{ {
info!(self.log, "Blobs sidecars are pruned"); info!(self.log, "Blobs sidecars are pruned");
return Ok(()); return Ok(());
@ -1798,20 +1811,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;
let end_slot = end_epoch.end_slot(E::slots_per_epoch());
// At most prune up until the data availability boundary epoch, leaving at least blobs in
// the data availability boundary epoch and younger.
let end_slot = {
let earliest_prunable_epoch = data_availability_boundary - 1;
// Stop pruning before reaching the data availability boundary if a margin is
// configured.
let end_epoch = if let Some(margin) = self.get_config().blob_prune_margin_epochs {
earliest_prunable_epoch - margin
} else {
earliest_prunable_epoch
};
end_epoch.end_slot(E::slots_per_epoch())
};
for res in self.forwards_block_roots_iterator_until( for res in self.forwards_block_roots_iterator_until(
oldest_blob_slot, oldest_blob_slot,