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

Allow parallel state processor to be interrupted by caller

Browse source
This commit is contained in:
Jerry 2023-04-14 10:29:59 -07:00
parent d76fc157aa
commit 48c1f9078d
3 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/blockstm/executor.go
View file

@ -2,6 +2,7 @@ package blockstm
import (
"container/heap"
"context"
"fmt"
"sync"
"time"
@ -369,13 +370,14 @@ func (pe *ParallelExecutor) Prepare() {
}(i)
}
pe.settleWg.Add(len(pe.tasks))
pe.settleWg.Add(1)
go func() {
for t := range pe.chSettle {
pe.tasks[t].Settle()
pe.settleWg.Done()
}
pe.settleWg.Done()
}()
// bootstrap first execution
@ -390,18 +392,15 @@ func (pe *ParallelExecutor) Prepare() {
func (pe *ParallelExecutor) Close(wait bool) {
close(pe.chTasks)
close(pe.chSpeculativeTasks)
close(pe.chSettle)
if wait {
pe.workerWg.Wait()
}
close(pe.chResults)
if wait {
pe.settleWg.Wait()
}
close(pe.chSettle)
}
// nolint: gocognit
@ -412,7 +411,7 @@ func (pe *ParallelExecutor) Step(res *ExecResult) (result ParallelExecutionResul
// If the transaction failed when we know it should not fail, this means the transaction itself is
// bad (e.g. wrong nonce), and we should exit the execution immediately
err = fmt.Errorf("could not apply tx %d [%v]: %w", tx, pe.tasks[tx].Hash(), abortErr.OriginError)
pe.Close(false)
pe.Close(true)
return
}
@ -582,7 +581,7 @@ func (pe *ParallelExecutor) Step(res *ExecResult) (result ParallelExecutionResul
type PropertyCheck func(*ParallelExecutor) error
func executeParallelWithCheck(tasks []ExecTask, profile bool, check PropertyCheck, metadata bool) (result ParallelExecutionResult, err error) {
func executeParallelWithCheck(tasks []ExecTask, profile bool, check PropertyCheck, metadata bool, interruptCtx context.Context) (result ParallelExecutionResult, err error) {
if len(tasks) == 0 {
return ParallelExecutionResult{MakeTxnInputOutput(len(tasks)), nil, nil, nil}, nil
}
@ -591,6 +590,15 @@ func executeParallelWithCheck(tasks []ExecTask, profile bool, check PropertyChec
pe.Prepare()
for range pe.chResults {
if interruptCtx != nil {
select {
case <-interruptCtx.Done():
pe.Close(true)
return result, interruptCtx.Err()
default:
}
}
res := pe.resultQueue.Pop().(ExecResult)
result, err = pe.Step(&res)
@ -611,6 +619,6 @@ func executeParallelWithCheck(tasks []ExecTask, profile bool, check PropertyChec
return
}
func ExecuteParallel(tasks []ExecTask, profile bool, metadata bool) (result ParallelExecutionResult, err error) {
return executeParallelWithCheck(tasks, profile, nil, metadata)
func ExecuteParallel(tasks []ExecTask, profile bool, metadata bool, interruptCtx context.Context) (result ParallelExecutionResult, err error) {
return executeParallelWithCheck(tasks, profile, nil, metadata, interruptCtx)
}

4
core/blockstm/executor_test.go
View file

@ -424,7 +424,7 @@ func runParallel(t *testing.T, tasks []ExecTask, validation PropertyCheck, metad
profile := false
start := time.Now()
result, err := executeParallelWithCheck(tasks, false, validation, metadata)
result, err := executeParallelWithCheck(tasks, false, validation, metadata, nil)
if result.Deps != nil && profile {
result.Deps.Report(*result.Stats, func(str string) { fmt.Println(str) })
@ -458,7 +458,7 @@ func runParallelGetMetadata(t *testing.T, tasks []ExecTask, validation PropertyC
t.Helper()
// fmt.Println("len(tasks)", len(tasks))
res, err := executeParallelWithCheck(tasks, true, validation, false)
res, err := executeParallelWithCheck(tasks, true, validation, false, nil)
assert.NoError(t, err, "error occur during parallel execution")

4
core/parallel_state_processor.go
View file

@ -376,7 +376,7 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat
backupStateDB := statedb.Copy()
profile := false
result, err := blockstm.ExecuteParallel(tasks, false, metadata)
result, err := blockstm.ExecuteParallel(tasks, false, metadata, interruptCtx)
if err == nil && profile {
_, weight := result.Deps.LongestPath(*result.Stats)
@ -412,7 +412,7 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat
t.totalUsedGas = usedGas
}
_, err = blockstm.ExecuteParallel(tasks, false, metadata)
_, err = blockstm.ExecuteParallel(tasks, false, metadata, interruptCtx)
break
}