Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Nov 26, 2019
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88fe4b5
p2p/discover: slow down lookups on empty table
fjl Nov 25, 2019
e277669
p2p/discover: wake from slowdown sleep when table is closed
fjl Nov 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions p2p/discover/lookup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package discover

import (
"context"
"time"

"github.com/ethereum/go-ethereum/p2p/enode"
)
Expand Down Expand Up @@ -106,6 +107,12 @@ func (it *lookup) startQueries() bool {
it.tab.mutex.Lock()
closest := it.tab.closest(it.result.target, bucketSize, false)
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 {
time.Sleep(1 * time.Second)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After having sleeped for a whole second, wouldn't it make sense to check it.tab.closest once more before returning empty?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're now using lookupIterator exclusively, it'll just come around and trigger another lookup right after one finishes without any result.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1 * time.Second -> time.Second?

}
it.queries = 1
it.replyCh <- closest.entries
return true
Expand Down