forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-04-30 05:12:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

p2p/discover: move wait condition to lookupIterator

Browse source
This commit is contained in:
Felix Lange 2025-08-29 15:47:28 +02:00
parent f8e0e8dc55
commit f4046b0cfb
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
p2p/discover/lookup.go
View file

@ -19,6 +19,7 @@ package discover
import ( import (
"context" "context"
"errors" "errors"
"time"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enode"
) )
@ -105,10 +106,8 @@ func (it *lookup) startQueries() bool {
// The first query returns nodes from the local table. // The first query returns nodes from the local table.
if it.queries == -1 { if it.queries == -1 {
closest := it.tab.findnodeByID(it.result.target, bucketSize, false) closest := it.tab.findnodeByID(it.result.target, bucketSize, false)
// Avoid finishing the lookup too quickly if table is empty.
// Wait for the table to fill.
if len(closest.entries) == 0 { if len(closest.entries) == 0 {
it.tab.waitForNodes(1) return false
} }
it.queries = 1 it.queries = 1
it.replyCh <- closest.entries it.replyCh <- closest.entries
@ -171,6 +170,7 @@ func (it *lookupIterator) Next() bool {
if len(it.buffer) > 0 { if len(it.buffer) > 0 {
it.buffer = it.buffer[1:] it.buffer = it.buffer[1:]
} }
// Advance the lookup to refill the buffer. // Advance the lookup to refill the buffer.
for len(it.buffer) == 0 { for len(it.buffer) == 0 {
if it.ctx.Err() != nil { if it.ctx.Err() != nil {
@ -183,6 +183,7 @@ func (it *lookupIterator) Next() bool {
continue continue
} }
if !it.lookup.advance() { if !it.lookup.advance() {
it.lookupFailed(it.lookup.tab)
it.lookup = nil it.lookup = nil
continue continue
} }
@ -191,6 +192,16 @@ func (it *lookupIterator) Next() bool {
return true return true
} }
// lookupFailed handles failed lookup attempts. This can be called when the table has
// exited, or when it runs out of nodes.
func (it *lookupIterator) lookupFailed(tab *Table) {
timeout, cancel := context.WithTimeout(it.ctx, 1*time.Minute)
defer cancel()
tab.waitForNodes(timeout, 1)
// TODO: here we need to trigger a table refresh somehow
}
// Close ends the iterator. // Close ends the iterator.
func (it *lookupIterator) Close() { func (it *lookupIterator) Close() {
it.cancel() it.cancel()