forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 06:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core: improve state recovery logging after unexpected shutdown

Browse source
This commit is contained in:
Sun Tae, Kim 2025-05-30 01:15:13 +09:00
parent e26e422195
commit 973a6a4ce5
1 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
core/blockchain.go
View file

@ -753,6 +753,8 @@ func (bc *BlockChain) rewindHashHead(head *types.Header, root common.Hash) (*typ
start = time.Now() // Timestamp the rewinding is restarted
logged = time.Now() // Timestamp last progress log was printed
blocksScanned = 0 // Number of blocks scanned during recovery
initialLogged = false // Whether initial recovery message was logged
)
// The oldest block to be searched is determined by the pivot block or a constant
// searching threshold. The rationale behind this is as follows:
@ -772,12 +774,30 @@ func (bc *BlockChain) rewindHashHead(head *types.Header, root common.Hash) (*typ
limit = head.Number.Uint64() - params.FullImmutabilityThreshold
}
for {
blocksScanned++
// Log initial recovery message once
if !initialLogged {
log.Info("State recovery after unexpected shutdown started",
"note", "This is normal and may take several minutes",
"action", "Please wait for completion")
initialLogged = true
}
logger := log.Trace
if time.Since(logged) > time.Second*8 {
logged = time.Now()
logger = log.Info
}
logger("Block state missing, rewinding further", "number", head.Number, "hash", head.Hash(), "elapsed", common.PrettyDuration(time.Since(start)))
// Improved progress logging with scan rate
rate := float64(blocksScanned) / time.Since(start).Seconds()
logger("State recovery in progress",
"number", head.Number,
"hash", head.Hash(),
"elapsed", common.PrettyDuration(time.Since(start)),
"blocks_scanned", blocksScanned,
"scan_rate", fmt.Sprintf("%.1f blocks/sec", rate))
// If a root threshold was requested but not yet crossed, check
if !beyondRoot && head.Root == root {
@ -835,15 +855,35 @@ func (bc *BlockChain) rewindPathHead(head *types.Header, root common.Hash) (*typ
start = time.Now() // Timestamp the rewinding is restarted
logged = time.Now() // Timestamp last progress log was printed
blocksScanned = 0 // Number of blocks scanned during recovery
initialLogged = false // Whether initial recovery message was logged
)
// Rewind the head block tag until an available state is found.
for {
blocksScanned++
// Log initial recovery message once
if !initialLogged {
log.Info("State recovery after unexpected shutdown started",
"note", "This is normal and may take several minutes",
"action", "Please wait for completion")
initialLogged = true
}
logger := log.Trace
if time.Since(logged) > time.Second*8 {
logged = time.Now()
logger = log.Info
}
logger("Block state missing, rewinding further", "number", head.Number, "hash", head.Hash(), "elapsed", common.PrettyDuration(time.Since(start)))
// Improved progress logging with scan rate
rate := float64(blocksScanned) / time.Since(start).Seconds()
logger("State recovery in progress",
"number", head.Number,
"hash", head.Hash(),
"elapsed", common.PrettyDuration(time.Since(start)),
"blocks_scanned", blocksScanned,
"scan_rate", fmt.Sprintf("%.1f blocks/sec", rate))
// If a root threshold was requested but not yet crossed, check
if !beyondRoot && head.Root == root {