Skip to content

[SharovBot] execution: make ValidateChain non-blocking to fix flaky timeout #21431

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

Open
erigon-copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[SharovBot] execution: make ValidateChain non-blocking to fix flaky timeout #21431

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f12c42
execution: make ValidateChain non-blocking to fix flaky timeout
erigon-copilot[bot] May 26, 2026
2ce066d
Merge branch 'main' into erigon-copilot/fix-validate-chain-flaky-timeout
AskAlexSharov May 28, 2026
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
26 changes: 25 additions & 1 deletion execution/execmodule/exec_module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,32 @@ func (e *ExecModule) ValidateChain(ctx context.Context, blockHash common.Hash, b
ValidationStatus: ExecutionStatusBusy,
}, nil
}
defer e.semaphore.Release(1)

type validationOutcome struct {
result ValidationResult
err error
}
outcomeCh := make(chan validationOutcome, 1)
done := make(chan struct{})

go func() {
defer close(done)
defer e.semaphore.Release(1)
result, err := e.validateChainImpl(e.bacgroundCtx, blockHash, blockNumber)
outcomeCh <- validationOutcome{result, err}
}()

select {
case o := <-outcomeCh:
<-done
return o.result, o.err
case <-ctx.Done():
e.logger.Debug("treating ValidateChain as asynchronous as caller context is done")
return ValidationResult{ValidationStatus: ExecutionStatusBusy}, nil
}
}

func (e *ExecModule) validateChainImpl(ctx context.Context, blockHash common.Hash, blockNumber uint64) (ValidationResult, error) {
e.hook.LastNewBlockSeen(blockNumber) // used by eth_syncing
e.currentContext.ResetPendingUpdates()
e.forkValidator.ClearWithUnwind()
Expand Down
Loading