Skip to content

Caplin: Better old-state pruning #11219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AskAlexSharov merged 1 commit into from
Jul 18, 2024
Merged

Caplin: Better old-state pruning #11219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions cl/phase1/forkchoice/fork_graph/fork_graph_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,15 +416,23 @@ func (f *forkGraphDisk) MarkHeaderAsInvalid(blockRoot libcommon.Hash) {
f.badBlocks.Store(blockRoot, struct{}{})
}

func (f *forkGraphDisk) hasBeaconState(blockRoot libcommon.Hash) bool {
_, err := f.fs.Stat(getBeaconStateFilename(blockRoot))
return err == nil
}

func (f *forkGraphDisk) Prune(pruneSlot uint64) (err error) {
pruneSlot -= f.beaconCfg.SlotsPerEpoch * 2
oldRoots := make([]libcommon.Hash, 0, f.beaconCfg.SlotsPerEpoch)
highestCrossedEpochSlot := uint64(0)
highestStoredBeaconStateSlot := uint64(0)
f.blocks.Range(func(key, value interface{}) bool {
hash := key.(libcommon.Hash)
signedBlock := value.(*cltypes.SignedBeaconBlock)
if signedBlock.Block.Slot%f.beaconCfg.SlotsPerEpoch == 0 && highestCrossedEpochSlot < signedBlock.Block.Slot {
highestCrossedEpochSlot = signedBlock.Block.Slot
if signedBlock.Block.Slot < highestStoredBeaconStateSlot {
return true
}
if f.hasBeaconState(hash) {
highestStoredBeaconStateSlot = signedBlock.Block.Slot
}
if signedBlock.Block.Slot >= pruneSlot {
return true
Expand All @@ -433,7 +441,7 @@ func (f *forkGraphDisk) Prune(pruneSlot uint64) (err error) {

return true
})
if pruneSlot >= highestCrossedEpochSlot {
if pruneSlot >= highestStoredBeaconStateSlot {
return
}

Expand Down