p2p: dial addrs which came from seed instead of calling ensurePeers (#3762)

Calling ensurePeers outside of ensurePeersRoutine can lead to nodes
disconnecting from us due to "sent next PEX request too soon" error.

Solution is to just dial addrs we got from src instead of calling
ensurePeers.

Refs #2093

Fixes #3338
This commit is contained in:
Anton Kaliaev 2019-07-02 21:19:58 +04:00 committed by GitHub
parent 62f97a69e9
commit d041476819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 5 deletions

View File

@ -31,3 +31,5 @@ program](https://hackerone.com/tendermint).
- [rpc] \#3700 Make possible to set absolute paths for TLS cert and key (@climber73) - [rpc] \#3700 Make possible to set absolute paths for TLS cert and key (@climber73)
### BUG FIXES: ### BUG FIXES:
- [p2p] \#3338 Prevent "sent next PEX request too soon" errors by not calling
ensurePeers outside of ensurePeersRoutine

View File

@ -340,6 +340,15 @@ func (r *PEXReactor) ReceiveAddrs(addrs []*p2p.NetAddress, src Peer) error {
if err != nil { if err != nil {
return err return err
} }
srcIsSeed := false
for _, seedAddr := range r.seedAddrs {
if seedAddr.Equals(srcAddr) {
srcIsSeed = true
break
}
}
for _, netAddr := range addrs { for _, netAddr := range addrs {
// Validate netAddr. Disconnect from a peer if it sends us invalid data. // Validate netAddr. Disconnect from a peer if it sends us invalid data.
if netAddr == nil { if netAddr == nil {
@ -365,13 +374,23 @@ func (r *PEXReactor) ReceiveAddrs(addrs []*p2p.NetAddress, src Peer) error {
} }
// If this address came from a seed node, try to connect to it without // If this address came from a seed node, try to connect to it without
// waiting. // waiting (#2093)
for _, seedAddr := range r.seedAddrs { if srcIsSeed {
if seedAddr.Equals(srcAddr) { r.Logger.Info("Will dial address, which came from seed", "addr", netAddr, "seed", srcAddr)
r.ensurePeers() go func(addr *p2p.NetAddress) {
err := r.dialPeer(addr)
if err != nil {
switch err.(type) {
case errMaxAttemptsToDial, errTooEarlyToDial:
r.Logger.Debug(err.Error(), "addr", addr)
default:
r.Logger.Error(err.Error(), "addr", addr)
} }
} }
}(netAddr)
} }
}
return nil return nil
} }