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

core: fix deadlock in parallel state processor

Browse source
This commit is contained in:
Marius van der Wijden 2026-03-19 12:03:28 +01:00 committed by MariusVanDerWijden
parent ff772bfa08
commit 077a58a49c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/parallel_state_processor.go
View file

@ -200,6 +200,7 @@ func (p *ParallelStateProcessor) resultHandler(block *types.Block, preTxStateRea
for { for {
select { select {
case res := <-txResCh: case res := <-txResCh:
numTxComplete++
if execErr == nil { if execErr == nil {
if res.err != nil { if res.err != nil {
execErr = res.err execErr = res.err
@ -212,7 +213,6 @@ func (p *ParallelStateProcessor) resultHandler(block *types.Block, preTxStateRea
} }
} }
} }
numTxComplete++
if numTxComplete == len(block.Transactions()) { if numTxComplete == len(block.Transactions()) {
break loop break loop
} }
@ -220,6 +220,8 @@ func (p *ParallelStateProcessor) resultHandler(block *types.Block, preTxStateRea
} }
if execErr != nil { if execErr != nil {
// Drain stateRootCalcResCh so calcAndVerifyRoot goroutine can exit.
<-stateRootCalcResCh
resCh <- &ProcessResultWithMetrics{ProcessResult: &ProcessResult{Error: execErr}} resCh <- &ProcessResultWithMetrics{ProcessResult: &ProcessResult{Error: execErr}}
return return
} }