Merge pull request #5381 from multiversx/snapshot-in-latest-storer-fix

Snapshot in latest storer fix
multiversx · Aug 18, 2023 · 44c0f9c · 44c0f9c
2 parents 69811e3 + 13e319a
commit 44c0f9c
Show file tree

Hide file tree

Showing 31 changed files with 1,555 additions and 690 deletions.
diff --git a/common/interface.go b/common/interface.go
@@ -183,6 +183,8 @@ type SnapshotStatisticsHandler interface {
 	NewSnapshotStarted()
 	WaitForSnapshotsToFinish()
 	AddTrieStats(handler TrieStatisticsHandler, trieType TrieType)
+	GetSnapshotDuration() int64
+	GetSnapshotNumNodes() uint64
 	IsInterfaceNil() bool
 }
 

diff --git a/epochStart/bootstrap/disabled/disabledAccountsAdapter.go b/epochStart/bootstrap/disabled/disabledAccountsAdapter.go
@@ -100,7 +100,7 @@ func (a *accountsAdapter) CancelPrune(_ []byte, _ state.TriePruningIdentifier) {
 }
 
 // SnapshotState -
-func (a *accountsAdapter) SnapshotState(_ []byte) {
+func (a *accountsAdapter) SnapshotState(_ []byte, _ uint32) {
 }
 
 // SetStateCheckpoint -

diff --git a/integrationTests/state/stateTrie/stateTrie_test.go b/integrationTests/state/stateTrie/stateTrie_test.go
@@ -2331,11 +2331,9 @@ func Test_SnapshotStateRemovesLastSnapshotStartedAfterSnapshotFinished(t *testin
 	_ = adb.SetSyncer(&mock.AccountsDBSyncerStub{})
 	rootHash, err := addDataTriesForAccountsStartingWithIndex(0, 1, 1, adb)
 	assert.Nil(t, err)
-	err = tsm.PutInEpoch([]byte(common.ActiveDBKey), []byte(common.ActiveDBVal), 0)
-	assert.Nil(t, err)
 
-	adb.SnapshotState(rootHash)
-	for tsm.IsPruningBlocked() {
+	adb.SnapshotState(rootHash, 1)
+	for adb.IsSnapshotInProgress() {
 		time.Sleep(10 * time.Millisecond)
 	}
 

diff --git a/integrationTests/state/stateTrieSync/stateTrieSync_test.go b/integrationTests/state/stateTrieSync/stateTrieSync_test.go
@@ -396,6 +396,10 @@ func addValuesToDataTrie(t *testing.T, adb state.AccountsAdapter, acc state.User
 	return acc.GetRootHash()
 }
 
+type snapshotWatcher interface {
+	IsSnapshotInProgress() bool
+}
+
 func TestSyncMissingSnapshotNodes(t *testing.T) {
 	if testing.Short() {
 		t.Skip("this is not a short test")
@@ -490,8 +494,11 @@ func testSyncMissingSnapshotNodes(t *testing.T, version int) {
 
 	tsm := nRequester.TrieStorageManagers[dataRetriever.UserAccountsUnit.String()]
 	_ = tsm.PutInEpoch([]byte(common.ActiveDBKey), []byte(common.ActiveDBVal), 0)
-	nRequester.AccntState.SnapshotState(rootHash)
-	for tsm.IsPruningBlocked() {
+	nRequester.AccntState.SnapshotState(rootHash, nRequester.EpochNotifier.CurrentEpoch())
+	sw, ok := nRequester.AccntState.(snapshotWatcher)
+	assert.True(t, ok)
+
+	for sw.IsSnapshotInProgress() {
 		time.Sleep(time.Millisecond * 100)
 	}
 	_ = nRequester.AccntState.RecreateTrie(rootHash)

diff --git a/process/block/metablock.go b/process/block/metablock.go
@@ -1443,8 +1443,8 @@ func (mp *metaProcessor) updateState(lastMetaBlock data.MetaHeaderHandler, lastM
 			"rootHash", lastMetaBlock.GetRootHash(),
 			"prevRootHash", prevMetaBlock.GetRootHash(),
 			"validatorStatsRootHash", lastMetaBlock.GetValidatorStatsRootHash())
-		mp.accountsDB[state.UserAccountsState].SnapshotState(lastMetaBlock.GetRootHash())
-		mp.accountsDB[state.PeerAccountsState].SnapshotState(lastMetaBlock.GetValidatorStatsRootHash())
+		mp.accountsDB[state.UserAccountsState].SnapshotState(lastMetaBlock.GetRootHash(), lastMetaBlock.GetEpoch())
+		mp.accountsDB[state.PeerAccountsState].SnapshotState(lastMetaBlock.GetValidatorStatsRootHash(), lastMetaBlock.GetEpoch())
 		go func() {
 			metaBlock, ok := lastMetaBlock.(*block.MetaBlock)
 			if !ok {

diff --git a/process/block/shardblock.go b/process/block/shardblock.go
@@ -1258,8 +1258,9 @@ func (sp *shardProcessor) snapShotEpochStartFromMeta(header data.ShardHeaderHand
 				log.Debug("using scheduled root hash for snapshotting", "schRootHash", schRootHash)
 				rootHash = schRootHash
 			}
-			log.Debug("shard trie snapshot from epoch start shard data", "rootHash", rootHash)
-			accounts.SnapshotState(rootHash)
+			epoch := header.GetEpoch()
+			log.Debug("shard trie snapshot from epoch start shard data", "rootHash", rootHash, "epoch", epoch)
+			accounts.SnapshotState(rootHash, epoch)
 			sp.markSnapshotDoneInPeerAccounts()
 			saveEpochStartEconomicsMetrics(sp.appStatusHandler, metaHdr)
 			go func() {

diff --git a/process/transactionEvaluator/simulationAccountsDB.go b/process/transactionEvaluator/simulationAccountsDB.go
@@ -139,7 +139,7 @@ func (r *simulationAccountsDB) CancelPrune(_ []byte, _ state.TriePruningIdentifi
 }
 
 // SnapshotState won't do anything as write operations are disabled on this component
-func (r *simulationAccountsDB) SnapshotState(_ []byte) {
+func (r *simulationAccountsDB) SnapshotState(_ []byte, _ uint32) {
 }
 
 // SetStateCheckpoint won't do anything as write operations are disabled on this component

diff --git a/process/transactionEvaluator/simulationAccountsDB_test.go b/process/transactionEvaluator/simulationAccountsDB_test.go
@@ -62,7 +62,7 @@ func TestReadOnlyAccountsDB_WriteOperationsShouldNotCalled(t *testing.T) {
 		CancelPruneCalled: func(_ []byte, _ state.TriePruningIdentifier) {
 			t.Errorf(failErrMsg)
 		},
-		SnapshotStateCalled: func(_ []byte) {
+		SnapshotStateCalled: func(_ []byte, _ uint32) {
 			t.Errorf(failErrMsg)
 		},
 		SetStateCheckpointCalled: func(_ []byte) {
@@ -96,7 +96,7 @@ func TestReadOnlyAccountsDB_WriteOperationsShouldNotCalled(t *testing.T) {
 
 	simAccountsDB.CancelPrune(nil, state.NewRoot)
 
-	simAccountsDB.SnapshotState(nil)
+	simAccountsDB.SnapshotState(nil, 0)
 
 	simAccountsDB.SetStateCheckpoint(nil)