Skip to content

cl/phase1/forkchoice/fork_graph: skip re-dumping an already dumped head state #25539

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
domiwei merged 5 commits into from
Nov 1, 2026
Merged

cl/phase1/forkchoice/fork_graph: skip re-dumping an already dumped head state #25539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f4cb62
cl/phase1/forkchoice/fork_graph: skip re-dumping the state of an alre…
domiwei Oct 29, 2026
6b00deb
cl/phase1/forkchoice/fork_graph: do not mark a panicked state dump as…
domiwei Oct 30, 2026
4a52476
cl/phase1/forkchoice/fork_graph: describe the last state dump key in …
domiwei Nov 1, 2026
a0a7ef6
cl/phase1/forkchoice/fork_graph: clear the whole last state dump key …
domiwei Nov 1, 2026
31582b1
cl/phase1/forkchoice/fork_graph: name the fields each disk I/O mutex …
domiwei Nov 1, 2026
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
10 changes: 7 additions & 3 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 @@ -151,9 +151,13 @@ type forkGraphDisk struct {
envelopeMissing sync.Map // common.Hash -> struct{}
invalidEnvelopes sync.Map // common.Hash -> struct{}

// reusable disk I/O buffers, each guarded by the mutex above it
stateDumpLock sync.Mutex
sszBuffer []byte
// stateDumpLock guards the reusable state buffer and the key of the last state dump
stateDumpLock sync.Mutex
sszBuffer []byte
lastDumpedRoot common.Hash
lastDumpedSlot uint64

// envelopeMu guards the reusable envelope buffer
envelopeMu sync.Mutex
envelopeSSZBuffer []byte

Expand Down
11 changes: 11 additions & 0 deletions cl/phase1/forkchoice/fork_graph/fork_graph_disk_fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ func (f *forkGraphDisk) DumpBeaconStateOnDisk(blockRoot common.Hash, bs *state.C
}
f.stateDumpLock.Lock()
defer f.stateDumpLock.Unlock()
slot := bs.Slot()
if blockRoot == f.lastDumpedRoot && slot == f.lastDumpedSlot {
return nil
}
f.lastDumpedRoot, f.lastDumpedSlot = common.Hash{}, 0
done := false
// Truncate and then grow the buffer to the size of the state.
f.sszBuffer, err = bs.EncodeSSZ(f.sszBuffer[:0])
if err != nil {
Expand All @@ -134,6 +140,10 @@ func (f *forkGraphDisk) DumpBeaconStateOnDisk(blockRoot common.Hash, bs *state.C
}
defer func() {
err = errors.Join(err, dumpedFile.Close())
if done && err == nil {
f.lastDumpedRoot = blockRoot
f.lastDumpedSlot = slot
}
}()

sw := snappypool.Writer(dumpedFile)
Expand Down Expand Up @@ -175,6 +185,7 @@ func (f *forkGraphDisk) DumpBeaconStateOnDisk(blockRoot common.Hash, bs *state.C
return err
}

done = true
return
}

Expand Down
120 changes: 118 additions & 2 deletions cl/phase1/forkchoice/fork_graph/fork_graph_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,9 @@ func (f *envelopeBlockingRenameFs) Stat(name string) (os.FileInfo, error) {
}

func (f envelopeWriteFailureFile) Write(p []byte) (int, error) {
if f.stage == "panic" {
panic(errTestEnvelopeIO)
}
if f.stage == "write" {
return 0, errTestEnvelopeIO
}
Expand Down Expand Up @@ -417,14 +420,127 @@ func TestForkGraphDumpsDoNotRequireSync(t *testing.T) {
func TestDumpBeaconStateReturnsCloseError(t *testing.T) {
anchorState := state.New(&clparams.MainnetBeaconConfig)
require.NoError(t, utils.DecodeSSZSnappy(anchorState, anchor, int(clparams.Phase0Version)))
wantHash, err := anchorState.HashSSZ()
require.NoError(t, err)
root, err := anchorState.BlockRoot()
require.NoError(t, err)
baseFs := afero.NewMemMapFs()
var closes atomic.Int32
fs := envelopeWriteFailureFs{Fs: afero.NewMemMapFs(), stage: "close", closes: &closes}
f := &forkGraphDisk{fs: fs, beaconCfg: &clparams.MainnetBeaconConfig}
f := &forkGraphDisk{
fs: envelopeWriteFailureFs{Fs: baseFs, stage: "close", closes: &closes},
beaconCfg: &clparams.MainnetBeaconConfig,
}

require.ErrorIs(t, f.DumpBeaconStateOnDisk(root, anchorState, true), errTestEnvelopeIO)
require.Equal(t, int32(1), closes.Load())
f.fs = envelopeWriteFailureFs{Fs: baseFs, closes: &closes}
require.NoError(t, f.DumpBeaconStateOnDisk(root, anchorState, true))
require.Equal(t, int32(2), closes.Load())
persisted, err := f.readBeaconStateFromDisk(root)
require.NoError(t, err)
gotHash, err := persisted.HashSSZ()
require.NoError(t, err)
require.Equal(t, wantHash, gotHash)
}

func TestDumpBeaconStateSkipsRepeatedRootAndSlot(t *testing.T) {
anchorState := state.New(&clparams.MainnetBeaconConfig)
require.NoError(t, utils.DecodeSSZSnappy(anchorState, anchor, int(clparams.Phase0Version)))
var closes atomic.Int32
fs := envelopeWriteFailureFs{Fs: afero.NewMemMapFs(), closes: &closes}
f := &forkGraphDisk{fs: fs, beaconCfg: &clparams.MainnetBeaconConfig}
root := common.HexToHash("0x1234")

require.NoError(t, f.DumpBeaconStateOnDisk(root, anchorState, true))
require.NoError(t, f.DumpBeaconStateOnDisk(root, anchorState, true))
require.Equal(t, int32(1), closes.Load())
}

func TestDumpBeaconStateWritesDifferentRoot(t *testing.T) {
anchorState := state.New(&clparams.MainnetBeaconConfig)
require.NoError(t, utils.DecodeSSZSnappy(anchorState, anchor, int(clparams.Phase0Version)))
var closes atomic.Int32
fs := envelopeWriteFailureFs{Fs: afero.NewMemMapFs(), closes: &closes}
f := &forkGraphDisk{fs: fs, beaconCfg: &clparams.MainnetBeaconConfig}

require.NoError(t, f.DumpBeaconStateOnDisk(common.HexToHash("0x1234"), anchorState, true))
require.NoError(t, f.DumpBeaconStateOnDisk(common.HexToHash("0x5678"), anchorState, true))
require.Equal(t, int32(2), closes.Load())
}

func TestDumpBeaconStateWritesSameRootAtDifferentSlot(t *testing.T) {
anchorState := state.New(&clparams.MainnetBeaconConfig)
require.NoError(t, utils.DecodeSSZSnappy(anchorState, anchor, int(clparams.Phase0Version)))
var closes atomic.Int32
fs := envelopeWriteFailureFs{Fs: afero.NewMemMapFs(), closes: &closes}
f := &forkGraphDisk{fs: fs, beaconCfg: &clparams.MainnetBeaconConfig}
root := common.HexToHash("0x1234")

require.NoError(t, f.DumpBeaconStateOnDisk(root, anchorState, true))
require.NoError(t, anchorState.SetSlot(anchorState.Slot()+1))
wantHash, err := anchorState.HashSSZ()
require.NoError(t, err)
require.NoError(t, f.DumpBeaconStateOnDisk(root, anchorState, true))
require.Equal(t, int32(2), closes.Load())
persisted, err := f.readBeaconStateFromDisk(root)
require.NoError(t, err)
require.Equal(t, anchorState.Slot(), persisted.Slot())
gotHash, err := persisted.HashSSZ()
require.NoError(t, err)
require.Equal(t, wantHash, gotHash)
}

func TestDumpBeaconStateRetriesEarlierSlotAfterLaterSlotFailure(t *testing.T) {
earlierState := state.New(&clparams.MainnetBeaconConfig)
require.NoError(t, utils.DecodeSSZSnappy(earlierState, anchor, int(clparams.Phase0Version)))
laterState, err := earlierState.Copy()
require.NoError(t, err)
wantHash, err := earlierState.HashSSZ()
require.NoError(t, err)
require.NoError(t, laterState.SetSlot(laterState.Slot()+1))
baseFs := afero.NewMemMapFs()
var closes atomic.Int32
fs := envelopeWriteFailureFs{Fs: baseFs, closes: &closes}
f := &forkGraphDisk{fs: fs, beaconCfg: &clparams.MainnetBeaconConfig}
root := common.HexToHash("0x1234")

require.NoError(t, f.DumpBeaconStateOnDisk(root, earlierState, true))
f.fs = envelopeWriteFailureFs{Fs: baseFs, stage: "write", closes: &closes}
require.ErrorIs(t, f.DumpBeaconStateOnDisk(root, laterState, true), errTestEnvelopeIO)
f.fs = envelopeWriteFailureFs{Fs: baseFs, closes: &closes}
require.NoError(t, f.DumpBeaconStateOnDisk(root, earlierState, true))
require.Equal(t, int32(3), closes.Load())
persisted, err := f.readBeaconStateFromDisk(root)
require.NoError(t, err)
gotHash, err := persisted.HashSSZ()
require.NoError(t, err)
require.Equal(t, wantHash, gotHash)
}

func TestDumpBeaconStateRetriesAfterPanic(t *testing.T) {
anchorState := state.New(&clparams.MainnetBeaconConfig)
require.NoError(t, utils.DecodeSSZSnappy(anchorState, anchor, int(clparams.Phase0Version)))
wantHash, err := anchorState.HashSSZ()
require.NoError(t, err)
baseFs := afero.NewMemMapFs()
f := &forkGraphDisk{
fs: envelopeWriteFailureFs{Fs: baseFs, stage: "panic"},
beaconCfg: &clparams.MainnetBeaconConfig,
}
root := common.HexToHash("0x1234")

require.PanicsWithValue(t, errTestEnvelopeIO, func() {
_ = f.DumpBeaconStateOnDisk(root, anchorState, true)
})
var closes atomic.Int32
f.fs = envelopeWriteFailureFs{Fs: baseFs, closes: &closes}
require.NoError(t, f.DumpBeaconStateOnDisk(root, anchorState, true))
require.Equal(t, int32(1), closes.Load())
persisted, err := f.readBeaconStateFromDisk(root)
require.NoError(t, err)
gotHash, err := persisted.HashSSZ()
require.NoError(t, err)
require.Equal(t, wantHash, gotHash)
}

func TestDumpEnvelopeErrorDoesNotPublishPartialFile(t *testing.T) {
Expand Down
Loading