mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2025-01-08 20:11:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

e3: worker stuck on exit (#6826)

Browse Source
This commit is contained in:
Alex Sharov 2023-02-10 13:18:39 +07:00 committed by GitHub
parent 0ebac009e7
commit 910ea64c3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/state/exec3/state.go
View File

@ -99,7 +99,11 @@ func (rw *Worker) ResetTx(chainTx kv.Tx) {
func (rw *Worker) Run() {
for txTask, ok := rw.rs.Schedule(); ok; txTask, ok = rw.rs.Schedule() {
rw.RunTxTask(txTask)
rw.resultCh <- txTask // Needs to have outside of the lock
select {
case rw.resultCh <- txTask: // Needs to have outside of the lock
case <-rw.ctx.Done():
return
}
}
}
@ -310,6 +314,7 @@ func (cr EpochReader) FindBeforeOrEqualNumber(number uint64) (blockNum uint64, b
}
func NewWorkersPool(lock sync.Locker, ctx context.Context, background bool, chainDb kv.RoDB, rs *state.StateV3, blockReader services.FullBlockReader, chainConfig *chain.Config, logger log.Logger, genesis *core.Genesis, engine consensus.Engine, workerCount int) (reconWorkers []*Worker, applyWorker *Worker, resultCh chan *exec22.TxTask, clear func()) {
ctx, cancel := context.WithCancel(ctx)
var wg sync.WaitGroup
queueSize := workerCount * 2
reconWorkers = make([]*Worker, workerCount)
@ -319,11 +324,13 @@ func NewWorkersPool(lock sync.Locker, ctx context.Context, background bool, chai
}
applyWorker = NewWorker(lock, ctx, false, chainDb, rs, blockReader, chainConfig, logger, genesis, resultCh, engine)
clear = func() {
cancel()
wg.Wait()
for _, w := range reconWorkers {
w.ResetTx(nil)
}
applyWorker.ResetTx(nil)
close(resultCh)
}
if background {
wg.Add(workerCount)