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

Merge pull request #741 from nspcc-dev/fix/network

Browse source 
network: fix possible deadlock in DefaultDiscovery
This commit is contained in:
Roman Khimov 2020-03-10 17:29:45 +03:00 committed by GitHub
commit b7fa8dd40f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/network/discovery.go
View file

@ -30,6 +30,7 @@ type Discoverer interface {
type DefaultDiscovery struct { type DefaultDiscovery struct {
transport Transporter transport Transporter
lock sync.RWMutex lock sync.RWMutex
closeMtx sync.RWMutex
dialTimeout time.Duration dialTimeout time.Duration
badAddrs map[string]bool badAddrs map[string]bool
connectedAddrs map[string]bool connectedAddrs map[string]bool
@ -90,11 +91,11 @@ func (d *DefaultDiscovery) pushToPoolOrDrop(addr string) {
// RequestRemote tries to establish a connection with n nodes. // RequestRemote tries to establish a connection with n nodes.
func (d *DefaultDiscovery) RequestRemote(n int) { func (d *DefaultDiscovery) RequestRemote(n int) {
d.lock.RLock() d.closeMtx.RLock()
if !d.isDead { if !d.isDead {
d.requestCh <- n d.requestCh <- n
} }
d.lock.RUnlock() d.closeMtx.RUnlock()
} }
// RegisterBadAddr registers the given address as a bad address. // RegisterBadAddr registers the given address as a bad address.
@ -179,9 +180,9 @@ func (d *DefaultDiscovery) tryAddress(addr string) {
// Close stops discoverer pool processing making discoverer almost useless. // Close stops discoverer pool processing making discoverer almost useless.
func (d *DefaultDiscovery) Close() { func (d *DefaultDiscovery) Close() {
d.lock.Lock() d.closeMtx.Lock()
d.isDead = true d.isDead = true
d.lock.Unlock() d.closeMtx.Unlock()
select { select {
case <-d.requestCh: // Drain the channel if there is anything there. case <-d.requestCh: // Drain the channel if there is anything there.
default: default: