forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth: avoid blocking when geth is closed, fix hang in waitSnapExtension

Browse source
This commit is contained in:
niuxiaojie81 2024-01-15 10:31:41 +08:00
parent 3758223e35
commit f05fcaa489
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eth/peerset.go
View file

@ -131,7 +131,6 @@ func (ps *peerSet) waitSnapExtension(peer *eth.Peer) (*snap.Peer, error) {
ps.snapWait[id] = wait
ps.lock.Unlock()
for {
select {
case p := <-wait:
return p, nil
@ -142,7 +141,6 @@ func (ps *peerSet) waitSnapExtension(peer *eth.Peer) (*snap.Peer, error) {
return nil, errPeerSetClosed
}
}
}
// registerPeer injects a new `eth` peer into the working set, or returns an error
// if the peer is already known.
@ -268,6 +266,8 @@ func (ps *peerSet) close() {
for _, p := range ps.peers {
p.Disconnect(p2p.DiscQuitting)
}
if !ps.closed {
close(ps.quitCh)
}
ps.closed = true
}