Skip to content

Fix removing headers at bootstrap #7798

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
ssd04 merged 2 commits into from
Mar 26, 2026
Merged

Fix removing headers at bootstrap #7798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b5233c
fix removing headers at bootstrap
ssd04 Mar 20, 2026
9943af0
add unit tests
ssd04 Mar 20, 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
12 changes: 10 additions & 2 deletions process/sync/storageBootstrap/baseStorageBootstrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,21 @@ func (st *storageBootstrapper) loadBlocks() error {
break
}

storageHeadersInfo = append(storageHeadersInfo, headerInfo)

if uint64(round) > st.bootstrapRoundIndex {
log.Debug("loadBlocks: removing round info",
"round", round,
"last header nonce", headerInfo.LastHeader.GetNonce(),
"lastRound", headerInfo.GetLastRound(),
)

st.cleanupStorage(headerInfo.LastHeader)
st.bootstrapper.cleanupNotarizedStorage(headerInfo.LastHeader.Hash)
round = headerInfo.LastRound
continue
}

storageHeadersInfo = append(storageHeadersInfo, headerInfo)

_, numHdrs := metricsLoader.UpdateMetricsFromStorage(st.store, st.uint64Converter, st.marshalizer, st.appStatusHandler, headerInfo.LastHeader.Nonce)
st.blkExecutor.SetNumProcessedObj(numHdrs)

Expand Down
266 changes: 266 additions & 0 deletions process/sync/storageBootstrap/metaStorageBootstrapper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,266 @@
package storageBootstrap

import (
"bytes"
"errors"
"testing"

"github.com/multiversx/mx-chain-core-go/core"
"github.com/multiversx/mx-chain-core-go/data"
"github.com/multiversx/mx-chain-core-go/data/block"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/multiversx/mx-chain-go/dataRetriever"
"github.com/multiversx/mx-chain-go/process"
"github.com/multiversx/mx-chain-go/process/block/bootstrapStorage"
"github.com/multiversx/mx-chain-go/process/mock"
"github.com/multiversx/mx-chain-go/storage"
"github.com/multiversx/mx-chain-go/testscommon"
dataRetrieverMocks "github.com/multiversx/mx-chain-go/testscommon/dataRetriever"
"github.com/multiversx/mx-chain-go/testscommon/enableEpochsHandlerMock"
epochNotifierMock "github.com/multiversx/mx-chain-go/testscommon/epochNotifier"
"github.com/multiversx/mx-chain-go/testscommon/marshallerMock"
"github.com/multiversx/mx-chain-go/testscommon/processMocks"
"github.com/multiversx/mx-chain-go/testscommon/shardingMocks"
"github.com/multiversx/mx-chain-go/testscommon/statusHandler"
storageMock "github.com/multiversx/mx-chain-go/testscommon/storage"
)

func TestMetaStorageBootstrapper_LoadFromStorageShouldCleanupRoundsAboveBootstrapRoundIndex(t *testing.T) {
t.Parallel()

t.Run("multiple rounds above bootstrapRoundIndex are cleaned before valid one", func(t *testing.T) {
t.Parallel()

marshaller := &marshallerMock.MarshalizerMock{}

// bootstrapRoundIndex is 97, highest round is 100
// rounds 100, 99, 98 are above the index and should be cleaned
// round 97 should be processed
bootstrapRoundIdx := uint64(97)

hdr := &block.MetaBlockV3{
Nonce: 96,
Round: 96,
ChainID: []byte("1"),
}
Comment thread
ssd04 marked this conversation as resolved.
hdrHash := []byte("header hash 96")
hdrBytes, _ := marshaller.Marshal(hdr)

cleanupCount := 0
savedLastRound := int64(0)
wasCalledBlockchainSetHeader := false

args := ArgsMetaStorageBootstrapper{
ArgsBaseStorageBootstrapper: ArgsBaseStorageBootstrapper{
BootStorer: &mock.BoostrapStorerMock{
GetHighestRoundCalled: func() int64 {
return 100
},
GetCalled: func(round int64) (bootstrapStorage.BootstrapData, error) {
return bootstrapStorage.BootstrapData{
LastHeader: bootstrapStorage.BootstrapHeaderInfo{
ShardId: core.MetachainShardId,
Epoch: hdr.GetEpoch(),
Nonce: hdr.GetNonce(),
Hash: hdrHash,
},
HighestFinalBlockNonce: hdr.GetNonce(),
LastRound: round - 1,
}, nil
},
SaveLastRoundCalled: func(round int64) error {
savedLastRound = round
return nil
},
},
ForkDetector: &mock.ForkDetectorMock{
AddHeaderCalled: func(header data.HeaderHandler, hash []byte, state process.BlockHeaderState, selfNotarizedHeaders []data.HeaderHandler, selfNotarizedHeadersHashes [][]byte) error {
return nil
},
},
BlockProcessor: &testscommon.BlockProcessorStub{},
ChainHandler: &testscommon.ChainHandlerStub{
GetGenesisHeaderCalled: func() data.HeaderHandler {
return nil
},
SetCurrentBlockHeaderAndRootHashCalled: func(header data.HeaderHandler, rootHash []byte) error {
wasCalledBlockchainSetHeader = true
return nil
},
GetCurrentBlockHeaderCalled: func() data.HeaderHandler {
if wasCalledBlockchainSetHeader {
return hdr
}
return nil
},
},
Marshalizer: marshaller,
Store: &storageMock.ChainStorerStub{
GetStorerCalled: func(unitType dataRetriever.UnitType) (storage.Storer, error) {
return &storageMock.StorerStub{
GetCalled: func(key []byte) ([]byte, error) {
if bytes.Equal(key, hdrHash) {
return hdrBytes, nil
}
return nil, errors.New("key not found")
},
RemoveCalled: func(key []byte) error {
cleanupCount++
return nil
},
SearchFirstCalled: func(key []byte) ([]byte, error) {
return nil, errors.New("not found")
},
}, nil
},
},
Uint64Converter: testscommon.NewNonceHashConverterMock(),
BootstrapRoundIndex: bootstrapRoundIdx,
ShardCoordinator: testscommon.NewMultiShardsCoordinatorMock(1),
NodesCoordinator: &shardingMocks.NodesCoordinatorMock{},
EpochStartTrigger: &mock.EpochStartTriggerStub{},
BlockTracker: &mock.BlockTrackerMock{
AddTrackedHeaderCalled: func(header data.HeaderHandler, hash []byte) {},
},
ChainID: "1",
ScheduledTxsExecutionHandler: &testscommon.ScheduledTxsExecutionStub{},
MiniblocksProvider: &mock.MiniBlocksProviderStub{},
EpochNotifier: &epochNotifierMock.EpochNotifierStub{},
ProcessedMiniBlocksTracker: &testscommon.ProcessedMiniBlocksTrackerStub{},
AppStatusHandler: &statusHandler.AppStatusHandlerMock{},
EnableEpochsHandler: &enableEpochsHandlerMock.EnableEpochsHandlerStub{},
ProofsPool: &dataRetrieverMocks.ProofsPoolMock{},
ExecutionManager: &processMocks.ExecutionManagerMock{},
},
PendingMiniBlocksHandler: &mock.PendingMiniBlocksHandlerStub{},
}

msb, err := NewMetaStorageBootstrapper(args)
require.Nil(t, err)

err = msb.LoadFromStorage()
assert.Nil(t, err)
assert.Equal(t, int64(97), savedLastRound)
// rounds 100, 99, 98 were above bootstrapRoundIndex=97, each triggers a Remove in cleanupStorage
assert.True(t, cleanupCount >= 3)
assert.True(t, wasCalledBlockchainSetHeader)
})

t.Run("bootstrapRoundIndex zero should cleaned all", func(t *testing.T) {
Copy link

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This subtest title has a grammatical error: "should cleaned all" -> "should clean all" (or similar).

Suggested change
t.Run("bootstrapRoundIndex zero should cleaned all", func(t *testing.T) {
t.Run("bootstrapRoundIndex zero should clean all", func(t *testing.T) {

Copilot uses AI. Check for mistakes.
t.Parallel()

marshaller := &marshallerMock.MarshalizerMock{}

bootstrapRoundIdx := uint64(0)

hdr := &block.MetaBlockV3{
Nonce: 96,
Round: 96,
ChainID: []byte("1"),
}
hdrHash := []byte("header hash 96")
hdrBytes, _ := marshaller.Marshal(hdr)

cleanupCount := 0
savedLastRound := int64(0)
wasCalledBlockchainSetHeader := false

args := ArgsMetaStorageBootstrapper{
ArgsBaseStorageBootstrapper: ArgsBaseStorageBootstrapper{
BootStorer: &mock.BoostrapStorerMock{
GetHighestRoundCalled: func() int64 {
return 100
},
GetCalled: func(round int64) (bootstrapStorage.BootstrapData, error) {
return bootstrapStorage.BootstrapData{
LastHeader: bootstrapStorage.BootstrapHeaderInfo{
ShardId: core.MetachainShardId,
Epoch: hdr.GetEpoch(),
Nonce: hdr.GetNonce(),
Hash: hdrHash,
},
HighestFinalBlockNonce: hdr.GetNonce(),
LastRound: round - 1,
}, nil
},
SaveLastRoundCalled: func(round int64) error {
savedLastRound = round
return nil
},
},
ForkDetector: &mock.ForkDetectorMock{
AddHeaderCalled: func(header data.HeaderHandler, hash []byte, state process.BlockHeaderState, selfNotarizedHeaders []data.HeaderHandler, selfNotarizedHeadersHashes [][]byte) error {
return nil
},
},
BlockProcessor: &testscommon.BlockProcessorStub{},
ChainHandler: &testscommon.ChainHandlerStub{
GetGenesisHeaderCalled: func() data.HeaderHandler {
return nil
},
SetCurrentBlockHeaderAndRootHashCalled: func(header data.HeaderHandler, rootHash []byte) error {
wasCalledBlockchainSetHeader = true
return nil
},
GetCurrentBlockHeaderCalled: func() data.HeaderHandler {
if wasCalledBlockchainSetHeader {
return hdr
}
return nil
},
},
Marshalizer: marshaller,
Store: &storageMock.ChainStorerStub{
GetStorerCalled: func(unitType dataRetriever.UnitType) (storage.Storer, error) {
return &storageMock.StorerStub{
GetCalled: func(key []byte) ([]byte, error) {
if bytes.Equal(key, hdrHash) {
return hdrBytes, nil
}
return nil, errors.New("key not found")
},
RemoveCalled: func(key []byte) error {
cleanupCount++
return nil
},
SearchFirstCalled: func(key []byte) ([]byte, error) {
return nil, errors.New("not found")
},
}, nil
},
},
Uint64Converter: testscommon.NewNonceHashConverterMock(),
BootstrapRoundIndex: bootstrapRoundIdx,
ShardCoordinator: testscommon.NewMultiShardsCoordinatorMock(1),
NodesCoordinator: &shardingMocks.NodesCoordinatorMock{},
EpochStartTrigger: &mock.EpochStartTriggerStub{},
BlockTracker: &mock.BlockTrackerMock{
AddTrackedHeaderCalled: func(header data.HeaderHandler, hash []byte) {},
},
ChainID: "1",
ScheduledTxsExecutionHandler: &testscommon.ScheduledTxsExecutionStub{},
MiniblocksProvider: &mock.MiniBlocksProviderStub{},
EpochNotifier: &epochNotifierMock.EpochNotifierStub{},
ProcessedMiniBlocksTracker: &testscommon.ProcessedMiniBlocksTrackerStub{},
AppStatusHandler: &statusHandler.AppStatusHandlerMock{},
EnableEpochsHandler: &enableEpochsHandlerMock.EnableEpochsHandlerStub{},
ProofsPool: &dataRetrieverMocks.ProofsPoolMock{},
ExecutionManager: &processMocks.ExecutionManagerMock{},
},
PendingMiniBlocksHandler: &mock.PendingMiniBlocksHandlerStub{},
}

msb, err := NewMetaStorageBootstrapper(args)
require.Nil(t, err)

err = msb.LoadFromStorage()
assert.Nil(t, err)
assert.Equal(t, int64(0), savedLastRound)

// all rounds info should be cleaned
assert.Equal(t, 100, cleanupCount)
Comment thread
ssd04 marked this conversation as resolved.
assert.True(t, wasCalledBlockchainSetHeader)
})
}
Loading
Loading