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: drop inactive peers

Browse source
This commit is contained in:
Zsolt Felfoldi 2019-12-26 20:09:58 +01:00
parent 6f1abbf2b5
commit c0b6ff20d1
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
les/clientpool.go
View file

@ -40,6 +40,7 @@ const (
fixedPointMultiplier = 0x1000000 // constant to convert logarithms to fixed point format fixedPointMultiplier = 0x1000000 // constant to convert logarithms to fixed point format
lazyQueueRefresh = time.Second * 10 // refresh period of the connected queue lazyQueueRefresh = time.Second * 10 // refresh period of the connected queue
tryActivatePeriod = time.Second * 5 // periodically check whether inactive clients can be activated tryActivatePeriod = time.Second * 5 // periodically check whether inactive clients can be activated
dropInactiveCycles = 2 // number of activation check periods after non-priority inactive peers are dropped
persistCumulativeTimeRefresh = time.Minute * 5 // refresh period of the cumulative running time persistence persistCumulativeTimeRefresh = time.Minute * 5 // refresh period of the cumulative running time persistence
posBalanceCacheLimit = 8192 // the maximum number of cached items in positive balance queue posBalanceCacheLimit = 8192 // the maximum number of cached items in positive balance queue
negBalanceCacheLimit = 8192 // the maximum number of cached items in negative balance queue negBalanceCacheLimit = 8192 // the maximum number of cached items in negative balance queue
@ -84,9 +85,11 @@ type clientPool struct {
closed bool closed bool
removePeer func(enode.ID) removePeer func(enode.ID)
connectedMap map[enode.ID]*clientInfo connectedMap map[enode.ID]*clientInfo
activeQueue *prque.LazyQueue activeQueue *prque.LazyQueue
inactiveQueue *prque.Prque inactiveQueue *prque.Prque
dropInactivePeers map[uint64][]*clientInfo
dropInactiveCounter uint64
activeBalances, inactiveBalances uint64 activeBalances, inactiveBalances uint64
lastConnectedBalanceUpdate, fullRatioLastUpdate mclock.AbsTime lastConnectedBalanceUpdate, fullRatioLastUpdate mclock.AbsTime
@ -237,6 +240,13 @@ func newClientPool(db ethdb.Database, minCap, freeClientCap uint64, clock mclock
case <-clock.After(tryActivatePeriod): case <-clock.After(tryActivatePeriod):
pool.lock.Lock() pool.lock.Lock()
pool.tryActivateClients() pool.tryActivateClients()
for _, c := range pool.dropInactivePeers[pool.dropInactiveCounter] {
if _, ok := pool.connectedMap[c.id]; ok && !c.active && !c.priority {
pool.disconnect(c.peer)
}
}
delete(pool.dropInactivePeers, pool.dropInactiveCounter)
pool.dropInactiveCounter++
pool.lock.Unlock() pool.lock.Unlock()
case <-pool.stopCh: case <-pool.stopCh:
return return
@ -404,6 +414,7 @@ func (f *clientPool) disconnect(p clientPeer) {
log.Debug("Client not connected", "address", p.freeClientId(), "id", peerIdToString(p.ID())) log.Debug("Client not connected", "address", p.freeClientId(), "id", peerIdToString(p.ID()))
return return
} }
tryActivate := e.active
if e.active { if e.active {
f.deactivateClient(e) f.deactivateClient(e)
} }
@ -412,7 +423,9 @@ func (f *clientPool) disconnect(p clientPeer) {
delete(f.connectedMap, e.id) delete(f.connectedMap, e.id)
clientDisconnectedMeter.Mark(1) clientDisconnectedMeter.Mark(1)
log.Debug("Client disconnected", "address", e.address) log.Debug("Client disconnected", "address", e.address)
f.tryActivateClients() if tryActivate {
f.tryActivateClients()
}
} }
// capAvailable checks whether the current priority level of the given client is enough to // capAvailable checks whether the current priority level of the given client is enough to
@ -530,7 +543,7 @@ func (f *clientPool) deactivateClient(e *clientInfo) {
e.peer.updateCapacity(0) e.peer.updateCapacity(0)
totalConnectedGauge.Update(int64(f.activeCap)) totalConnectedGauge.Update(int64(f.activeCap))
f.inactiveQueue.Push(e, -connPriority(e, f.clock.Now())) f.inactiveQueue.Push(e, -connPriority(e, f.clock.Now()))
//TODO start timer f.dropInactivePeers[f.dropInactiveCounter+dropInactiveCycles] = append(f.dropInactivePeers[f.dropInactiveCounter+dropInactiveCycles], e)
} }
func (f *clientPool) tryActivateClients() { func (f *clientPool) tryActivateClients() {