Skip to content

eth: fix potential hang in waitSnapExtension #28744

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

Merged
merged 5 commits into from
Jan 15, 2024
Merged

eth: fix potential hang in waitSnapExtension #28744

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
adedf76
eth: avoid blocking when geth is closed, fix hang in waitSnapExtension
niuxiaojie81 Dec 29, 2023
488c5d2
Merge pull request #1 from ethereum/master
niuxiaojie81 Jan 10, 2024
14a2915
eth: avoid blocking when geth is closed, fix hang in waitSnapExtension
niuxiaojie81 Jan 10, 2024
3758223
Merge pull request #2 from ethereum/master
niuxiaojie81 Jan 15, 2024
f05fcaa
eth: avoid blocking when geth is closed, fix hang in waitSnapExtension
niuxiaojie81 Jan 15, 2024
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
15 changes: 14 additions & 1 deletion eth/peerset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ type peerSet struct {

lock sync.RWMutex
closed bool
quitCh chan struct{} // Quit channel to signal termination
}

// newPeerSet creates a new peer set to track the active participants.
Expand All @@ -65,6 +66,7 @@ func newPeerSet() *peerSet {
peers: make(map[string]*ethPeer),
snapWait: make(map[string]chan *snap.Peer),
snapPend: make(map[string]*snap.Peer),
quitCh: make(chan struct{}),
}
}

Expand Down Expand Up @@ -129,7 +131,15 @@ func (ps *peerSet) waitSnapExtension(peer *eth.Peer) (*snap.Peer, error) {
ps.snapWait[id] = wait
ps.lock.Unlock()

return <-wait, nil
select {
case p := <-wait:
return p, nil
case <-ps.quitCh:
ps.lock.Lock()
delete(ps.snapWait, id)
ps.lock.Unlock()
return nil, errPeerSetClosed
}
}

// registerPeer injects a new `eth` peer into the working set, or returns an error
Expand Down Expand Up @@ -256,5 +266,8 @@ func (ps *peerSet) close() {
for _, p := range ps.peers {
p.Disconnect(p2p.DiscQuitting)
}
if !ps.closed {
close(ps.quitCh)
}
ps.closed = true
}