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 2023-12-29 10:41:56 +08:00
parent d2e3cb894b
commit adedf76f3e
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
eth/peerset.go
View file

@ -21,6 +21,7 @@ import (
"fmt" "fmt"
"math/big" "math/big"
"sync" "sync"
"time"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/eth/protocols/eth" "github.com/ethereum/go-ethereum/eth/protocols/eth"
@ -28,6 +29,11 @@ import (
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
) )
const (
// snapWaitTimeout is the amount of time to wait for the snap protocol to be started.
snapWaitTimeout = 5 * time.Second
)
var ( var (
// errPeerSetClosed is returned if a peer is attempted to be added or removed // errPeerSetClosed is returned if a peer is attempted to be added or removed
// from the peer set after it has been terminated. // from the peer set after it has been terminated.
@ -44,6 +50,9 @@ var (
// errSnapWithoutEth is returned if a peer attempts to connect only on the // errSnapWithoutEth is returned if a peer attempts to connect only on the
// snap protocol without advertising the eth main protocol. // snap protocol without advertising the eth main protocol.
errSnapWithoutEth = errors.New("peer connected on snap without compatible eth support") errSnapWithoutEth = errors.New("peer connected on snap without compatible eth support")
// errSnapTimeout is returned if the peer takes too long to start the snap protocol.
errSnapTimeout = errors.New("peer timeout starting snap protocol")
) )
// peerSet represents the collection of active peers currently participating in // peerSet represents the collection of active peers currently participating in
@ -129,7 +138,21 @@ func (ps *peerSet) waitSnapExtension(peer *eth.Peer) (*snap.Peer, error) {
ps.snapWait[id] = wait ps.snapWait[id] = wait
ps.lock.Unlock() ps.lock.Unlock()
return <-wait, nil t := time.NewTicker(snapWaitTimeout)
defer t.Stop()
for {
select {
case p := <-wait:
return p, nil
case <-t.C:
if ps.closed {
ps.lock.Lock()
delete(ps.snapWait, id)
ps.lock.Unlock()
return nil, errSnapTimeout
}
}
}
} }
// registerPeer injects a new `eth` peer into the working set, or returns an error // registerPeer injects a new `eth` peer into the working set, or returns an error