fix panic issue in initializeStateAntiquaryIfNeeded (#11608) (#11624)

related to #11482
erigontech · Aug 15, 2024 · 617308b · 617308b
1 parent d24e5d4
commit 617308b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/cl/antiquary/state_antiquary.go b/cl/antiquary/state_antiquary.go
@@ -423,8 +423,9 @@ func (s *Antiquary) initializeStateAntiquaryIfNeeded(ctx context.Context, tx kv.
 		return err
 	}
 	// We want to backoff by some slots until we get a correct state from DB.
-	// we start from 1 * clparams.SlotsPerDump.
-	backoffStep := uint64(10)
+	// we start from 10 * clparams.SlotsPerDump.
+	backoffStrides := uint64(10)
+	backoffStep := backoffStrides
 
 	historicalReader := historical_states_reader.NewHistoricalStatesReader(s.cfg, s.snReader, s.validatorsTable, s.genesisState)
 
@@ -447,6 +448,11 @@ func (s *Antiquary) initializeStateAntiquaryIfNeeded(ctx context.Context, tx kv.
 		if err != nil {
 			return fmt.Errorf("failed to read historical state at slot %d: %w", attempt, err)
 		}
+		if s.currentState == nil {
+			log.Warn("historical state not found, backoff more and try again", "slot", attempt)
+			backoffStep += backoffStrides
+			continue
+		}
 
 		computedBlockRoot, err := s.currentState.BlockRoot()
 		if err != nil {
@@ -459,7 +465,7 @@ func (s *Antiquary) initializeStateAntiquaryIfNeeded(ctx context.Context, tx kv.
 		if computedBlockRoot != expectedBlockRoot {
 			log.Debug("Block root mismatch, trying again", "slot", attempt, "expected", expectedBlockRoot)
 			// backoff more
-			backoffStep += 10
+			backoffStep += backoffStrides
 			continue
 		}
 		break

diff --git a/cl/persistence/state/historical_states_reader/historical_states_reader.go b/cl/persistence/state/historical_states_reader/historical_states_reader.go
@@ -19,6 +19,7 @@ import (
 	"github.com/ledgerwatch/erigon/cl/phase1/core/state"
 	"github.com/ledgerwatch/erigon/cl/phase1/core/state/lru"
 	"github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks"
+	"github.com/ledgerwatch/log/v3"
 
 	libcommon "github.com/ledgerwatch/erigon-lib/common"
 )
@@ -62,6 +63,7 @@ func (r *HistoricalStatesReader) ReadHistoricalState(ctx context.Context, tx kv.
 
 	// If this happens, we need to update our static tables
 	if slot > latestProcessedState || slot > r.validatorTable.Slot() {
+		log.Warn("slot is ahead of the latest processed state", "slot", slot, "latestProcessedState", latestProcessedState, "validatorTableSlot", r.validatorTable.Slot())
 		return nil, nil
 	}
 
@@ -74,6 +76,7 @@ func (r *HistoricalStatesReader) ReadHistoricalState(ctx context.Context, tx kv.
 		return nil, err
 	}
 	if block == nil {
+		log.Warn("block not found", "slot", slot)
 		return nil, nil
 	}
 	blockHeader := block.SignedBeaconBlockHeader().Header
@@ -84,6 +87,7 @@ func (r *HistoricalStatesReader) ReadHistoricalState(ctx context.Context, tx kv.
 		return nil, err
 	}
 	if slotData == nil {
+		log.Warn("slot data not found", "slot", slot)
 		return nil, nil
 	}
 	roundedSlot := r.cfg.RoundSlotToEpoch(slot)
@@ -93,6 +97,7 @@ func (r *HistoricalStatesReader) ReadHistoricalState(ctx context.Context, tx kv.
 		return nil, fmt.Errorf("failed to read epoch data: %w", err)
 	}
 	if epochData == nil {
+		log.Warn("epoch data not found", "slot", slot, "roundedSlot", roundedSlot)
 		return nil, nil
 	}