Skip to content

[SharovBot] fix race in DecryptedTxnsPool.Wait causing flaky TestShutterBlockBuilding #21899

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

Closed
erigon-copilot wants to merge 1 commit into from
Closed

[SharovBot] fix race in DecryptedTxnsPool.Wait causing flaky TestShutterBlockBuilding #21899

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion txnprovider/shutter/decrypted_txns_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ func NewDecryptedTxnsPool() *DecryptedTxnsPool {
}

func (p *DecryptedTxnsPool) Wait(ctx context.Context, mark DecryptionMark) error {
var found bool
done := make(chan struct{})
go func() {
defer close(done)
Expand All @@ -59,17 +60,21 @@ func (p *DecryptedTxnsPool) Wait(ctx context.Context, mark DecryptionMark) error
for _, ok := p.decryptedTxns[mark]; !ok && ctx.Err() == nil; _, ok = p.decryptedTxns[mark] {
p.decryptionCond.Wait()
}
_, found = p.decryptedTxns[mark]
}()

select {
case <-ctx.Done():
// note the below will wake up all waiters prematurely, but thanks to the for loop condition
// in the waiting goroutine the ones that still need to wait will go back to sleep
p.decryptionCond.Broadcast()
<-done
Comment on lines 67 to +71
case <-done:
// no-op
}

if found {
return nil
}
return ctx.Err()
}

Expand Down
Loading