Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix deadlock in 'SimulatedBeacon.loop' #29476

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −3
Draft

Fix deadlock in 'SimulatedBeacon.loop' #29476

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 17 additions & 3 deletions eth/catalyst/simulated_beacon_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package catalyst

import (
"context"
"sync/atomic"
"time"

"github.com/ethereum/go-ethereum/common"
Expand All @@ -32,8 +33,9 @@ type api struct {

func (a *api) loop() {
var (
newTxs = make(chan core.NewTxsEvent)
sub = a.sim.eth.TxPool().SubscribeTransactions(newTxs, true)
committing atomic.Bool
newTxs = make(chan core.NewTxsEvent)
sub = a.sim.eth.TxPool().SubscribeTransactions(newTxs, true)
)
defer sub.Unsubscribe()

Expand All @@ -42,12 +44,24 @@ func (a *api) loop() {
case <-a.sim.shutdownCh:
return
case w := <-a.sim.withdrawals.pending:
// FIXME: `sealBlock` will block the loop and `newTxs` won't be
// read. If new TX will be submitted to the pool while we're
// sealing the block, deadlock will occur.
withdrawals := append(a.sim.withdrawals.gatherPending(9), w)
if err := a.sim.sealBlock(withdrawals, uint64(time.Now().Unix())); err != nil {
log.Warn("Error performing sealing work", "err", err)
}
case <-newTxs:
a.sim.Commit()
go func() {
if committing.Swap(true) {
return
}
a.sim.Commit()
// FIXME: This is race-y, if `newTxs` arrive after we
// `Commit`ted but before we unset `committing`, `newTxs` will
// be skipped. Needs redesign.
committing.Store(false)
}()
}
}
}
Expand Down