Skip to content

Commit e969d4a

Browse files
simplify exec loop: lazy senders recovery (erigontech#13086)
1 parent 2fb7108 commit e969d4a

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

cmd/state/exec3/historical_trace_worker.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,9 @@ func NewHistoricalTraceWorkers(consumer TraceConsumer, cfg *ExecArgs, ctx contex
324324
cancel()
325325
g.Wait()
326326
rws.Close()
327-
reducerGroup.Wait()
327+
if err := reducerGroup.Wait(); err != nil {
328+
panic(err)
329+
}
328330
for _, w := range workers {
329331
w.ResetTx(nil)
330332
}
@@ -342,7 +344,7 @@ func processResultQueueHistorical(consumer TraceConsumer, rws *state.ResultsQueu
342344
for rwsIt.HasNext(outputTxNum) {
343345
txTask := rwsIt.PopNext()
344346
if txTask.Error != nil {
345-
return outputTxNum, false, err
347+
return outputTxNum, false, txTask.Error
346348
}
347349

348350
if txTask.TxIndex >= 0 && !txTask.Final {

eth/stagedsync/stage_custom_trace.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ func customTraceBatch(ctx context.Context, cfg *exec3.ExecArgs, tx kv.TemporalRw
173173
var m runtime.MemStats
174174
if err := exec3.CustomTraceMapReduce(fromBlock, toBlock, exec3.TraceConsumer{
175175
NewTracer: func() exec3.GenericTracer { return nil },
176-
Reduce: func(txTask *state.TxTask, tx kv.Tx) (err error) {
176+
Reduce: func(txTask *state.TxTask, tx kv.Tx) error {
177177
if txTask.Error != nil {
178-
return err
178+
return txTask.Error
179179
}
180180

181181
if txTask.Tx != nil {

0 commit comments

Comments
 (0)