forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 22:56:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

eth: close engine before handler for graceful shutdown (#1189)

Browse source
This commit is contained in:
Manav Darji 2024-04-15 10:38:09 +05:30 committed by GitHub
parent ffe810e55a
commit f6969dbc46
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
eth/backend.go
View file

@ -822,6 +822,12 @@ func (s *Ethereum) Stop() error {
// Stop all the peer-related stuff first. // Stop all the peer-related stuff first.
s.ethDialCandidates.Close() s.ethDialCandidates.Close()
s.snapDialCandidates.Close() s.snapDialCandidates.Close()
// Close the engine before handler else it may cause a deadlock where
// the heimdall is unresponsive and the syncing loop keeps waiting
// for a response and is unable to proceed to exit `Finalize` during
// block processing.
s.engine.Close()
s.handler.Stop() s.handler.Stop()
// Then stop everything else. // Then stop everything else.
@ -834,7 +840,6 @@ func (s *Ethereum) Stop() error {
s.txPool.Close() s.txPool.Close()
s.miner.Close() s.miner.Close()
s.blockchain.Stop() s.blockchain.Stop()
s.engine.Close()
// Clean shutdown marker as the last thing before closing db // Clean shutdown marker as the last thing before closing db
s.shutdownTracker.Stop() s.shutdownTracker.Stop()