cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

p2p/discover: slow down lookups on empty table (#20389)

Browse Source 
* p2p/discover: slow down lookups on empty table

* p2p/discover: wake from slowdown sleep when table is closed
This commit is contained in:
Felix Lange 2019-11-26 11:14:43 +01:00 committed by Péter Szilágyi
parent 8c1e8de839
commit 2e98706a99
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
p2p/discover/lookup.go
View File

@ -18,6 +18,7 @@ package discover
import ( import (
"context" "context"
"time"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enode"
) )
@ -106,6 +107,12 @@ func (it *lookup) startQueries() bool {
it.tab.mutex.Lock() it.tab.mutex.Lock()
closest := it.tab.closest(it.result.target, bucketSize, false) closest := it.tab.closest(it.result.target, bucketSize, false)
it.tab.mutex.Unlock() it.tab.mutex.Unlock()
// Avoid finishing the lookup too quickly if table is empty. It'd be better to wait
// for the table to fill in this case, but there is no good mechanism for that
// yet.
if len(closest.entries) == 0 {
it.slowdown()
}
it.queries = 1 it.queries = 1
it.replyCh <- closest.entries it.replyCh <- closest.entries
return true return true
@ -124,6 +131,15 @@ func (it *lookup) startQueries() bool {
return it.queries > 0 return it.queries > 0
} }
func (it *lookup) slowdown() {
sleep := time.NewTimer(1 * time.Second)
defer sleep.Stop()
select {
case <-sleep.C:
case <-it.tab.closeReq:
}
}
func (it *lookup) query(n *node, reply chan<- []*node) { func (it *lookup) query(n *node, reply chan<- []*node) {
fails := it.tab.db.FindFails(n.ID(), n.IP()) fails := it.tab.db.FindFails(n.ID(), n.IP())
r, err := it.queryfunc(n) r, err := it.queryfunc(n)