From 68153ff6e63b9d947069767500334a082c35b0f0 Mon Sep 17 00:00:00 2001
From: Alex Sharov <AskAlexSharov@gmail.com>
Date: Sat, 2 Apr 2022 10:47:01 +0700
Subject: [PATCH] Relax segments expectation (#3812)
* skip empty seg
* skip empty seg
* skip empty seg
---
eth/stagedsync/stage_headers.go | 17 ++++++++++++++++-
turbo/snapshotsync/block_snapshots.go | 2 +-
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/eth/stagedsync/stage_headers.go b/eth/stagedsync/stage_headers.go
index 148a65834f..d9ce8a2ff8 100644
--- a/eth/stagedsync/stage_headers.go
+++ b/eth/stagedsync/stage_headers.go
@@ -969,7 +969,22 @@ func DownloadAndIndexSnapshotsIfNeed(s *StageState, ctx context.Context, tx kv.R
}
expect := cfg.snapshotHashesCfg.ExpectBlocks
if cfg.snapshots.SegmentsAvailable() < expect {
- return fmt.Errorf("not enough snapshots available: %d > %d", expect, cfg.snapshots.SegmentsAvailable())
+ c, err := tx.Cursor(kv.Headers)
+ if err != nil {
+ return err
+ }
+ defer c.Close()
+ firstK, _, err := c.First()
+ if err != nil {
+ return err
+ }
+ c.Close()
+ hasInDB := binary.BigEndian.Uint64(firstK)
+ if cfg.snapshots.SegmentsAvailable() < hasInDB {
+ return fmt.Errorf("not enough snapshots available: snapshots=%d, blockInDB=%d, expect=%d", cfg.snapshots.SegmentsAvailable(), hasInDB, expect)
+ } else {
+ log.Warn(fmt.Sprintf("not enough snapshots available: %d < %d, but we can re-generate them because DB has historical blocks up to: %d", cfg.snapshots.SegmentsAvailable(), expect, hasInDB))
+ }
}
if err := cfg.snapshots.Reopen(); err != nil {
return fmt.Errorf("ReopenIndices: %w", err)
diff --git a/turbo/snapshotsync/block_snapshots.go b/turbo/snapshotsync/block_snapshots.go
index f659103700..81ddf6612e 100644
--- a/turbo/snapshotsync/block_snapshots.go
+++ b/turbo/snapshotsync/block_snapshots.go
@@ -2005,7 +2005,7 @@ func (m *Merger) removeOldFiles(toDel []string, snapshotsDir *dir.Rw) error {
ext := filepath.Ext(f)
withoutExt := f[:len(f)-len(ext)]
_ = os.Remove(withoutExt + ".idx")
- if strings.HasSuffix(f, Transactions.String()) {
+ if strings.HasSuffix(withoutExt, Transactions.String()) {
_ = os.Remove(withoutExt + "-to-block.idx")
_ = os.Remove(withoutExt + "-id.idx")
}
--
GitLab