forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

les: fixed deadlock

Browse source
This commit is contained in:
Zsolt Felfoldi 2020-01-03 17:47:50 +01:00
parent 5486e28bbf
commit d338384f9e
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
les/clientpool.go
View file

@ -243,7 +243,7 @@ func newClientPool(db ethdb.Database, minCap, freeClientCap uint64, clock mclock
pool.tryActivateClients() pool.tryActivateClients()
for _, c := range pool.dropInactivePeers[pool.dropInactiveCounter] { for _, c := range pool.dropInactivePeers[pool.dropInactiveCounter] {
if _, ok := pool.connectedMap[c.id]; ok && !c.active && !c.priority { if _, ok := pool.connectedMap[c.id]; ok && !c.active && !c.priority {
pool.disconnect(c.peer) pool.disconnectLocked(c.peer)
} }
} }
delete(pool.dropInactivePeers, pool.dropInactiveCounter) delete(pool.dropInactivePeers, pool.dropInactiveCounter)
@ -406,6 +406,10 @@ func (f *clientPool) disconnect(p clientPeer) {
f.lock.Lock() f.lock.Lock()
defer f.lock.Unlock() defer f.lock.Unlock()
f.disconnectLocked(p)
}
func (f *clientPool) disconnectLocked(p clientPeer) {
// Short circuit if client pool is already closed. // Short circuit if client pool is already closed.
if f.closed { if f.closed {
return return