cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #1149 from filecoin-project/fix/peermgr-ts

Browse Source 
make expand peers thread safe
This commit is contained in:
Łukasz Magiera 2020-01-24 17:38:35 +01:00 committed by GitHub
commit 9e95372e5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
peermgr/peermgr.go
View File

@ -42,7 +42,7 @@ type PeerMgr struct {
maxFilPeers int maxFilPeers int
minFilPeers int minFilPeers int
expanding bool expanding chan struct{}
h host.Host h host.Host
dht *dht.IpfsDHT dht *dht.IpfsDHT
@ -56,7 +56,8 @@ func NewPeerMgr(h host.Host, dht *dht.IpfsDHT, bootstrap dtypes.BootstrapPeers)
dht: dht, dht: dht,
bootstrappers: bootstrap, bootstrappers: bootstrap,
peers: make(map[peer.ID]time.Duration), peers: make(map[peer.ID]time.Duration),
expanding: make(chan struct{}, 1),
maxFilPeers: MaxFilPeers, maxFilPeers: MaxFilPeers,
minFilPeers: MinFilPeers, minFilPeers: MinFilPeers,
@ -125,18 +126,19 @@ func (pmgr *PeerMgr) getPeerCount() int {
} }
func (pmgr *PeerMgr) expandPeers() { func (pmgr *PeerMgr) expandPeers() {
if pmgr.expanding { select {
case pmgr.expanding <- struct{}{}:
default:
return return
} }
pmgr.expanding = true
go func() { go func() {
defer func() {
pmgr.expanding = false
}()
ctx, cancel := context.WithTimeout(context.TODO(), time.Second*30) ctx, cancel := context.WithTimeout(context.TODO(), time.Second*30)
defer cancel() defer cancel()
pmgr.doExpand(ctx) pmgr.doExpand(ctx)
<-pmgr.expanding
}() }()
} }