mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-20 10:52:25 +00:00
core: fix import errors on clique crashes + empty blocks
this addresses clique non-archive node re-syncing state after a non-graceful shutdown: https://github.com/ethereum/go-ethereum/issues/19838 code is borrowed from: https://github.com/ethereum/go-ethereum/pull/19544
This commit is contained in:
parent
4bcc0a37ab
commit
c149c5caec
1 changed files with 100 additions and 16 deletions
|
|
@ -922,6 +922,26 @@ func (bc *BlockChain) WriteBlockWithoutState(block *types.Block, td *big.Int) (e
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// writeKnownBlock updates the head block flag with a known block
|
||||||
|
// and introduces chain reorg if necessary.
|
||||||
|
func (bc *BlockChain) writeKnownBlock(block *types.Block) error {
|
||||||
|
bc.wg.Add(1)
|
||||||
|
defer bc.wg.Done()
|
||||||
|
|
||||||
|
current := bc.CurrentBlock()
|
||||||
|
if block.ParentHash() != current.Hash() {
|
||||||
|
if err := bc.reorg(current, block); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Write the positional metadata for transaction/receipt lookups.
|
||||||
|
// Preimages here is empty, ignore it.
|
||||||
|
rawdb.WriteTxLookupEntries(bc.db, block)
|
||||||
|
|
||||||
|
bc.insert(block)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// WriteBlockWithState writes the block and all associated state to the database.
|
// WriteBlockWithState writes the block and all associated state to the database.
|
||||||
func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types.Receipt, state *state.StateDB) (status WriteStatus, err error) {
|
func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types.Receipt, state *state.StateDB) (status WriteStatus, err error) {
|
||||||
bc.wg.Add(1)
|
bc.wg.Add(1)
|
||||||
|
|
@ -1108,7 +1128,7 @@ func (bc *BlockChain) InsertChain(chain types.Blocks) (int, error) {
|
||||||
// is imported, but then new canon-head is added before the actual sidechain
|
// is imported, but then new canon-head is added before the actual sidechain
|
||||||
// completes, then the historic state could be pruned again
|
// completes, then the historic state could be pruned again
|
||||||
func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals bool) (int, []interface{}, []*types.Log, error) {
|
func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals bool) (int, []interface{}, []*types.Log, error) {
|
||||||
// If the chain is terminating, don't even bother starting u
|
// If the chain is terminating, don't even bother starting up
|
||||||
if atomic.LoadInt32(&bc.procInterrupt) == 1 {
|
if atomic.LoadInt32(&bc.procInterrupt) == 1 {
|
||||||
return 0, nil, nil, nil
|
return 0, nil, nil, nil
|
||||||
}
|
}
|
||||||
|
|
@ -1139,14 +1159,58 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals bool) (int, []
|
||||||
it := newInsertIterator(chain, results, bc.Validator())
|
it := newInsertIterator(chain, results, bc.Validator())
|
||||||
|
|
||||||
block, err := it.next()
|
block, err := it.next()
|
||||||
|
|
||||||
|
// Left-trim all the known blocks
|
||||||
|
if err == ErrKnownBlock {
|
||||||
|
// First block (and state) is known
|
||||||
|
// 1. We did a roll-back, and should now do a re-import
|
||||||
|
// 2. The block is stored as a sidechain, and is lying about it's stateroot, and passes a stateroot
|
||||||
|
// from the canonical chain, which has not been verified.
|
||||||
|
// Skip all known blocks that are behind us
|
||||||
|
var (
|
||||||
|
current = bc.CurrentBlock()
|
||||||
|
localTd = bc.GetTd(current.Hash(), current.NumberU64())
|
||||||
|
externTd = bc.GetTd(block.ParentHash(), block.NumberU64()-1) // The first block can't be nil
|
||||||
|
)
|
||||||
|
for block != nil && err == ErrKnownBlock {
|
||||||
|
externTd = new(big.Int).Add(externTd, block.Difficulty())
|
||||||
|
if localTd.Cmp(externTd) < 0 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
log.Debug("Ignoring already known block", "number", block.Number(), "hash", block.Hash())
|
||||||
|
stats.ignored++
|
||||||
|
|
||||||
|
block, err = it.next()
|
||||||
|
}
|
||||||
|
// The remaining blocks are still known blocks, the only scenario here is:
|
||||||
|
// During the fast sync, the pivot point is already submitted but rollback
|
||||||
|
// happens. Then node resets the head full block to a lower height via `rollback`
|
||||||
|
// and leaves a few known blocks in the database.
|
||||||
|
//
|
||||||
|
// When node runs a fast sync again, it can re-import a batch of known blocks via
|
||||||
|
// `insertChain` while a part of them have higher total difficulty than current
|
||||||
|
// head full block(new pivot point).
|
||||||
|
for block != nil && err == ErrKnownBlock {
|
||||||
|
log.Debug("Writing previously known block", "number", block.Number(), "hash", block.Hash())
|
||||||
|
if err := bc.writeKnownBlock(block); err != nil {
|
||||||
|
return it.index, nil, nil, err
|
||||||
|
}
|
||||||
|
lastCanon = block
|
||||||
|
|
||||||
|
block, err = it.next()
|
||||||
|
}
|
||||||
|
// Falls through to the block import
|
||||||
|
}
|
||||||
switch {
|
switch {
|
||||||
// First block is pruned, insert as sidechain and reorg only if TD grows enough
|
// First block is pruned, insert as sidechain and reorg only if TD grows enough
|
||||||
case err == consensus.ErrPrunedAncestor:
|
case err == consensus.ErrPrunedAncestor:
|
||||||
|
log.Debug("Pruned ancestor, inserting as sidechain", "number", block.Number(), "hash", block.Hash())
|
||||||
return bc.insertSidechain(block, it)
|
return bc.insertSidechain(block, it)
|
||||||
|
|
||||||
// First block is future, shove it (and all children) to the future queue (unknown ancestor)
|
// First block is future, shove it (and all children) to the future queue (unknown ancestor)
|
||||||
case err == consensus.ErrFutureBlock || (err == consensus.ErrUnknownAncestor && bc.futureBlocks.Contains(it.first().ParentHash())):
|
case err == consensus.ErrFutureBlock || (err == consensus.ErrUnknownAncestor && bc.futureBlocks.Contains(it.first().ParentHash())):
|
||||||
for block != nil && (it.index == 0 || err == consensus.ErrUnknownAncestor) {
|
for block != nil && (it.index == 0 || err == consensus.ErrUnknownAncestor) {
|
||||||
|
log.Debug("Future block, postponing import", "number", block.Number(), "hash", block.Hash())
|
||||||
if err := bc.addFutureBlock(block); err != nil {
|
if err := bc.addFutureBlock(block); err != nil {
|
||||||
return it.index, events, coalescedLogs, err
|
return it.index, events, coalescedLogs, err
|
||||||
}
|
}
|
||||||
|
|
@ -1158,20 +1222,6 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals bool) (int, []
|
||||||
// If there are any still remaining, mark as ignored
|
// If there are any still remaining, mark as ignored
|
||||||
return it.index, events, coalescedLogs, err
|
return it.index, events, coalescedLogs, err
|
||||||
|
|
||||||
// First block (and state) is known
|
|
||||||
// 1. We did a roll-back, and should now do a re-import
|
|
||||||
// 2. The block is stored as a sidechain, and is lying about it's stateroot, and passes a stateroot
|
|
||||||
// from the canonical chain, which has not been verified.
|
|
||||||
case err == ErrKnownBlock:
|
|
||||||
// Skip all known blocks that behind us
|
|
||||||
current := bc.CurrentBlock().NumberU64()
|
|
||||||
|
|
||||||
for block != nil && err == ErrKnownBlock && current >= block.NumberU64() {
|
|
||||||
stats.ignored++
|
|
||||||
block, err = it.next()
|
|
||||||
}
|
|
||||||
// Falls through to the block import
|
|
||||||
|
|
||||||
// Some other error occurred, abort
|
// Some other error occurred, abort
|
||||||
case err != nil:
|
case err != nil:
|
||||||
stats.ignored += len(it.chain)
|
stats.ignored += len(it.chain)
|
||||||
|
|
@ -1179,7 +1229,7 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals bool) (int, []
|
||||||
return it.index, events, coalescedLogs, err
|
return it.index, events, coalescedLogs, err
|
||||||
}
|
}
|
||||||
// No validation errors for the first block (or chain prefix skipped)
|
// No validation errors for the first block (or chain prefix skipped)
|
||||||
for ; block != nil && err == nil; block, err = it.next() {
|
for ; block != nil && err == nil || err == ErrKnownBlock; block, err = it.next() {
|
||||||
// If the chain is terminating, stop processing blocks
|
// If the chain is terminating, stop processing blocks
|
||||||
if atomic.LoadInt32(&bc.procInterrupt) == 1 {
|
if atomic.LoadInt32(&bc.procInterrupt) == 1 {
|
||||||
log.Debug("Premature abort during blocks processing")
|
log.Debug("Premature abort during blocks processing")
|
||||||
|
|
@ -1190,6 +1240,32 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals bool) (int, []
|
||||||
bc.reportBlock(block, nil, ErrBlacklistedHash)
|
bc.reportBlock(block, nil, ErrBlacklistedHash)
|
||||||
return it.index, events, coalescedLogs, ErrBlacklistedHash
|
return it.index, events, coalescedLogs, ErrBlacklistedHash
|
||||||
}
|
}
|
||||||
|
// If the block is known (in the middle of the chain), it's a special case for
|
||||||
|
// Clique blocks where they can share state among each other, so importing an
|
||||||
|
// older block might complete the state of the subsequent one. In this case,
|
||||||
|
// just skip the block (we already validated it once fully (and crashed), since
|
||||||
|
// its header and body was already in the database).
|
||||||
|
if err == ErrKnownBlock {
|
||||||
|
logger := log.Debug
|
||||||
|
if bc.chainConfig.Clique == nil {
|
||||||
|
logger = log.Warn
|
||||||
|
}
|
||||||
|
logger("Inserted known block", "number", block.Number(), "hash", block.Hash(),
|
||||||
|
"uncles", len(block.Uncles()), "txs", len(block.Transactions()), "gas", block.GasUsed(),
|
||||||
|
"root", block.Root())
|
||||||
|
|
||||||
|
if err := bc.writeKnownBlock(block); err != nil {
|
||||||
|
return it.index, nil, nil, err
|
||||||
|
}
|
||||||
|
stats.processed++
|
||||||
|
|
||||||
|
// We can assume that logs are empty here, since the only way for consecutive
|
||||||
|
// Clique blocks to have the same state is if there are no transactions.
|
||||||
|
events = append(events, ChainEvent{block, block.Hash(), nil})
|
||||||
|
lastCanon = block
|
||||||
|
|
||||||
|
continue
|
||||||
|
}
|
||||||
// Retrieve the parent block and it's state to execute on top
|
// Retrieve the parent block and it's state to execute on top
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
|
|
||||||
|
|
@ -1247,6 +1323,14 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals bool) (int, []
|
||||||
"txs", len(block.Transactions()), "gas", block.GasUsed(), "uncles", len(block.Uncles()),
|
"txs", len(block.Transactions()), "gas", block.GasUsed(), "uncles", len(block.Uncles()),
|
||||||
"root", block.Root())
|
"root", block.Root())
|
||||||
events = append(events, ChainSideEvent{block})
|
events = append(events, ChainSideEvent{block})
|
||||||
|
|
||||||
|
default:
|
||||||
|
// This in theory is impossible, but lets be nice to our future selves and leave
|
||||||
|
// a log, instead of trying to track down blocks imports that don't emit logs.
|
||||||
|
log.Warn("Inserted block with unknown status", "number", block.Number(), "hash", block.Hash(),
|
||||||
|
"diff", block.Difficulty(), "elapsed", common.PrettyDuration(time.Since(start)),
|
||||||
|
"txs", len(block.Transactions()), "gas", block.GasUsed(), "uncles", len(block.Uncles()),
|
||||||
|
"root", block.Root())
|
||||||
}
|
}
|
||||||
blockInsertTimer.UpdateSince(start)
|
blockInsertTimer.UpdateSince(start)
|
||||||
stats.processed++
|
stats.processed++
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue