From 7c1795b0ed19059f657609882ba1ca2ec12635b5 Mon Sep 17 00:00:00 2001 From: blxdyx Date: Mon, 24 Feb 2025 22:33:45 +0800 Subject: [PATCH 1/3] fix snapshots download --- erigon-lib/downloader/webseed.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erigon-lib/downloader/webseed.go b/erigon-lib/downloader/webseed.go index 5139caecfe7..c04b7c54010 100644 --- a/erigon-lib/downloader/webseed.go +++ b/erigon-lib/downloader/webseed.go @@ -670,7 +670,7 @@ func (d *WebSeeds) callTorrentHttpProvider(ctx context.Context, url *url.URL, fi request = request.WithContext(ctx) resp, err := d.client.Do(request) if err != nil { - return nil, fmt.Errorf("webseed.downloadTorrentFile: url=%s, %w", url.String(), err) + return nil, nil } defer resp.Body.Close() //protect against too small and too big data From 9dc1b830313388003e1de7c260ec80d9517c906c Mon Sep 17 00:00:00 2001 From: blxdyx Date: Mon, 24 Feb 2025 22:40:25 +0800 Subject: [PATCH 2/3] fix snapshots download --- erigon-lib/downloader/webseed.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erigon-lib/downloader/webseed.go b/erigon-lib/downloader/webseed.go index c04b7c54010..5872af76b5f 100644 --- a/erigon-lib/downloader/webseed.go +++ b/erigon-lib/downloader/webseed.go @@ -645,7 +645,7 @@ func (d *WebSeeds) DownloadAndSaveTorrentFile(ctx context.Context, name string) continue // it's ok if some HTTP provider failed - try next one } res, err := d.callTorrentHttpProvider(ctx, parsedUrl, name) - if err != nil { + if res == nil || err != nil { d.logger.Debug("[snapshots] .torrent from webseed rejected", "name", name, "err", err, "url", urlStr) continue // it's ok if some HTTP provider failed - try next one } From 0c4512942cb46c244e2b2163b4754fe3c06ced62 Mon Sep 17 00:00:00 2001 From: blxdyx Date: Mon, 24 Feb 2025 22:41:09 +0800 Subject: [PATCH 3/3] fix snapshots download --- erigon-lib/downloader/webseed.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erigon-lib/downloader/webseed.go b/erigon-lib/downloader/webseed.go index 5872af76b5f..4d55974f65b 100644 --- a/erigon-lib/downloader/webseed.go +++ b/erigon-lib/downloader/webseed.go @@ -645,7 +645,7 @@ func (d *WebSeeds) DownloadAndSaveTorrentFile(ctx context.Context, name string) continue // it's ok if some HTTP provider failed - try next one } res, err := d.callTorrentHttpProvider(ctx, parsedUrl, name) - if res == nil || err != nil { + if err != nil || res == nil { d.logger.Debug("[snapshots] .torrent from webseed rejected", "name", name, "err", err, "url", urlStr) continue // it's ok if some HTTP provider failed - try next one }