dstepanov-yadro/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

Merge pull request #1592 from nspcc-dev/dont-reconnect-if-pool-is-connected

Browse source 
network: drop requests to discovery pool when it can't be handled
This commit is contained in:
Roman Khimov 2020-12-07 10:43:51 +03:00 committed by GitHub
commit fb13acab94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/network/discovery.go
View file

@ -232,15 +232,22 @@ func (d *DefaultDiscovery) run() {
requested-- requested--
} }
default: // Empty pool default: // Empty pool
var added int
d.lock.Lock() d.lock.Lock()
for _, addr := range d.seeds { for _, addr := range d.seeds {
if !d.connectedAddrs[addr] { if !d.connectedAddrs[addr] {
delete(d.badAddrs, addr) delete(d.badAddrs, addr)
d.unconnectedAddrs[addr] = connRetries d.unconnectedAddrs[addr] = connRetries
d.pushToPoolOrDrop(addr) d.pushToPoolOrDrop(addr)
added++
} }
} }
d.lock.Unlock() d.lock.Unlock()
// The pool is empty, but all seed nodes are already connected,
// we can end up in an infinite loop here, so drop the request.
if added == 0 {
requested = 0
}
} }
} }
if !ok { if !ok {