Skip to content

discv5: only store crawl error if no query succeeded #55

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

Merged
dennis-tra merged 2 commits into from
Feb 1, 2024
Merged

discv5: only store crawl error if no query succeeded #55

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0b17e6
removed discv5 crawl error if 1 query succeeds
guillaumemichel Jan 31, 2024
9a1a685
fixed successful query detection
guillaumemichel Jan 31, 2024
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
16 changes: 13 additions & 3 deletions discv5/crawler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/ethereum/go-ethereum/p2p/enode"
"github.com/libp2p/go-libp2p/core/network"
"github.com/libp2p/go-libp2p/core/peer"
"github.com/libp2p/go-libp2p/p2p/host/basic"
basichost "github.com/libp2p/go-libp2p/p2p/host/basic"
ma "github.com/multiformats/go-multiaddr"
log "github.com/sirupsen/logrus"
"go.uber.org/atomic"
Expand All @@ -25,6 +25,8 @@ import (
"github.com/dennis-tra/nebula-crawler/discvx"
)

const MaxCrawlRetriesAfterTimeout = 2 // magic

type CrawlerConfig struct {
DialTimeout time.Duration
AddrDialType config.AddrType
Expand Down Expand Up @@ -464,14 +466,14 @@ func (c *Crawler) crawlDiscV5(ctx context.Context, pi PeerInfo) chan DiscV5Resul
// internally, so we won't gain much by spawning multiple parallel go
// routines here. Stop the process as soon as we have received a timeout and
// don't let the following calls time out as well.
for i := 0; i <= discvx.NBuckets; i++ { // 15 is maximum
for i := 0; i <= discvx.NBuckets; i++ { // 17 is maximum
var neighbors []*enode.Node
neighbors, err = c.listener.FindNode(pi.Node, []uint{uint(discvx.HashBits - i)})
if err != nil {

if errors.Is(err, discvx.ErrTimeout) {
timeouts += 1
if timeouts < 2 {
if timeouts < MaxCrawlRetriesAfterTimeout {
continue
}
}
Expand All @@ -480,6 +482,7 @@ func (c *Crawler) crawlDiscV5(ctx context.Context, pi PeerInfo) chan DiscV5Resul
err = fmt.Errorf("getting closest peer with CPL %d: %w", i, err)
break
}
timeouts = 0

if result.RespondedAt == nil {
now := time.Now()
Expand Down Expand Up @@ -510,6 +513,13 @@ func (c *Crawler) crawlDiscV5(ctx context.Context, pi PeerInfo) chan DiscV5Resul
result.RoutingTable.Neighbors = append(result.RoutingTable.Neighbors, n)
}

// if we have at least a successful result, delete error
// bitwise operation checks whether errorBits is a power of 2 minus 1,
// if not, then there was at least one successful result
if result.Error != nil && (result.RoutingTable.ErrorBits&(result.RoutingTable.ErrorBits+1)) == 0 {
result.Error = nil
}

// if there was a connection error, parse it to a known one
if result.Error != nil {
result.ErrorStr = db.NetError(result.Error)
Expand Down