"erigon snapsots retire": to build all files (#9979)

erigontech · Apr 18, 2024 · 014aeff · 014aeff
1 parent cac82df
commit 014aeff
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 32 deletions.
diff --git a/erigon-lib/state/aggregator_v3.go b/erigon-lib/state/aggregator_v3.go
@@ -276,8 +276,6 @@ func (a *AggregatorV3) OpenFolder(readonly bool) error {
 }
 
 func (a *AggregatorV3) OpenList(files []string, readonly bool) error {
-	//log.Warn("[dbg] OpenList", "l", files)
-
 	a.filesMutationLock.Lock()
 	defer a.filesMutationLock.Unlock()
 	eg := &errgroup.Group{}

diff --git a/eth/stagedsync/stage_snapshots.go b/eth/stagedsync/stage_snapshots.go
@@ -455,6 +455,7 @@ func SnapshotsPrune(s *PruneState, initialCycle bool, cfg SnapshotsCfg, ctx cont
 			} else {
 				cfg.blockRetire.SetWorkers(1)
 			}
+
 			cfg.blockRetire.RetireBlocksInBackground(ctx, minBlockNumber, s.ForwardProgress, log.LvlDebug, func(downloadRequest []services.DownloadRequest) error {
 				if cfg.snapshotDownloader != nil && !reflect.ValueOf(cfg.snapshotDownloader).IsNil() {
 					if err := snapshotsync.RequestSnapshotsDownload(ctx, downloadRequest, cfg.snapshotDownloader); err != nil {

diff --git a/turbo/snapshotsync/freezeblocks/block_reader.go b/turbo/snapshotsync/freezeblocks/block_reader.go
@@ -803,7 +803,6 @@ func (r *BlockReader) txnByID(txnID uint64, sn *Segment, buf []byte) (txn types.
 }
 
 func (r *BlockReader) txnByHash(txnHash common.Hash, segments []*Segment, buf []byte) (types.Transaction, uint64, bool, error) {
-	fmt.Printf("[dbg] txnByHash1\n")
 	for i := len(segments) - 1; i >= 0; i-- {
 		sn := segments[i]
 
@@ -900,7 +899,6 @@ func (r *BlockReader) TxnLookup(_ context.Context, tx kv.Getter, txnHash common.
 		return 0, false, err
 	}
 
-	fmt.Printf("[dbg] txnByHash0: %t\n", n != nil)
 	if n != nil {
 		return *n, true, nil
 	}

diff --git a/turbo/snapshotsync/freezeblocks/block_snapshots.go b/turbo/snapshotsync/freezeblocks/block_snapshots.go
@@ -1361,47 +1361,52 @@ func (br *BlockRetire) RetireBlocksInBackground(ctx context.Context, minBlockNum
 			defer br.snBuildAllowed.Release(1)
 		}
 
-		for {
-			maxBlockNum := br.maxScheduledBlock.Load()
+		err := br.RetireBlocks(ctx, minBlockNum, maxBlockNum, lvl, seedNewSnapshots, onDeleteSnapshots)
+		if err != nil {
+			br.logger.Warn("[snapshots] retire blocks", "err", err)
+			return
+		}
+	}()
+}
+
+func (br *BlockRetire) RetireBlocks(ctx context.Context, minBlockNum uint64, maxBlockNum uint64, lvl log.Lvl, seedNewSnapshots func(downloadRequest []services.DownloadRequest) error, onDeleteSnapshots func(l []string) error) error {
+	if maxBlockNum > br.maxScheduledBlock.Load() {
+		br.maxScheduledBlock.Store(maxBlockNum)
+	}
+	includeBor := br.chainConfig.Bor != nil
 
-			err := br.RetireBlocks(ctx, minBlockNum, maxBlockNum, lvl, seedNewSnapshots, onDeleteSnapshots)
+	var err error
+	for {
+		var ok, okBor bool
 
-			if err != nil {
-				br.logger.Warn("[snapshots] retire blocks", "err", err)
-				return
-			}
+		minBlockNum = cmp.Max(br.blockReader.FrozenBlocks(), minBlockNum)
+		maxBlockNum = br.maxScheduledBlock.Load()
 
-			if maxBlockNum == br.maxScheduledBlock.Load() {
-				return
+		if includeBor {
+			// "bor snaps" can be behind "block snaps", it's ok: for example because of `kill -9` in the middle of merge
+			okBor, err = br.retireBorBlocks(ctx, br.blockReader.FrozenBorBlocks(), minBlockNum, lvl, seedNewSnapshots, onDeleteSnapshots)
+			if err != nil {
+				return err
 			}
 		}
-	}()
-}
 
-func (br *BlockRetire) RetireBlocks(ctx context.Context, minBlockNum uint64, maxBlockNum uint64, lvl log.Lvl, seedNewSnapshots func(downloadRequest []services.DownloadRequest) error, onDeleteSnapshots func(l []string) error) (err error) {
-	includeBor := br.chainConfig.Bor != nil
-	minBlockNum = cmp.Max(br.blockReader.FrozenBlocks(), minBlockNum)
-	if includeBor {
-		// "bor snaps" can be behind "block snaps", it's ok: for example because of `kill -9` in the middle of merge
-		_, err := br.retireBorBlocks(ctx, br.blockReader.FrozenBorBlocks(), minBlockNum, lvl, seedNewSnapshots, onDeleteSnapshots)
+		ok, err = br.retireBlocks(ctx, minBlockNum, maxBlockNum, lvl, seedNewSnapshots, onDeleteSnapshots)
 		if err != nil {
 			return err
 		}
-	}
 
-	_, err = br.retireBlocks(ctx, minBlockNum, maxBlockNum, lvl, seedNewSnapshots, onDeleteSnapshots)
-	if err != nil {
-		return err
-	}
+		if includeBor {
+			minBorBlockNum := cmp.Max(br.blockReader.FrozenBorBlocks(), minBlockNum)
+			okBor, err = br.retireBorBlocks(ctx, minBorBlockNum, maxBlockNum, lvl, seedNewSnapshots, onDeleteSnapshots)
+			if err != nil {
+				return err
+			}
+		}
 
-	if includeBor {
-		minBorBlockNum := cmp.Max(br.blockReader.FrozenBorBlocks(), minBlockNum)
-		_, err = br.retireBorBlocks(ctx, minBorBlockNum, maxBlockNum, lvl, seedNewSnapshots, onDeleteSnapshots)
-		if err != nil {
-			return err
+		if !(ok || okBor) {
+			break
 		}
 	}
-
 	return nil
 }