snapshots: fix filesByRange (erigontech#9472) (erigontech#9489)

battlmonstr · web-flow · commit f12e451ca72e · 2024-02-22T12:43:59.000+01:00
The method was iterating over snapshots.segments.Min().segments, but
passing the index to view.Segments().

This might lead to a crash, because those 2 collections are different,
and the indexes might not match.

view.Segments() only contains the snapshot files that are fully
downloaded and indexed.

The code is changed to only use the view files (as it was before).
diff --git a/erigon-lib/downloader/snaptype/type.go b/erigon-lib/downloader/snaptype/type.go
@@ -325,4 +325,13 @@ var (
 	BorSnapshotTypes = []Type{BorEvents, BorSpans}
 
 	CaplinSnapshotTypes = []Type{BeaconBlocks}
+
+	AllTypes = []Type{
+		Headers,
+		Bodies,
+		Transactions,
+		BorEvents,
+		BorSpans,
+		BeaconBlocks,
+	}
 )
diff --git a/turbo/snapshotsync/freezeblocks/block_snapshots.go b/turbo/snapshotsync/freezeblocks/block_snapshots.go
@@ -2143,26 +2143,32 @@ func (m *Merger) FindMergeRanges(currentRanges []Range, maxBlockNum uint64) (toM
 
 func (m *Merger) filesByRange(snapshots *RoSnapshots, from, to uint64) (map[snaptype.Enum][]string, error) {
 	toMerge := map[snaptype.Enum][]string{}
+
 	view := snapshots.View()
 	defer view.Close()
 
-	if _, first, ok := snapshots.segments.Min(); ok {
-		for i, sn := range first.segments {
-			if sn.from < from {
-				continue
-			}
-			if sn.to > to {
-				break
-			}
+	for _, t := range snaptype.AllTypes {
+		toMerge[t.Enum()] = m.filesByRangeOfType(view, from, to, t)
+	}
 
-			snapshots.segments.Scan(func(key snaptype.Enum, value *segments) bool {
-				toMerge[key] = append(toMerge[key], view.Segments(key.Type())[i].FilePath())
-				return true
-			})
+	return toMerge, nil
+}
+
+func (m *Merger) filesByRangeOfType(view *View, from, to uint64, snapshotType snaptype.Type) []string {
+	paths := make([]string, 0)
+
+	for _, sn := range view.Segments(snapshotType) {
+		if sn.from < from {
+			continue
 		}
+		if sn.to > to {
+			break
+		}
+
+		paths = append(paths, sn.FilePath())
 	}
 
-	return toMerge, nil
+	return paths
 }
 
 // Merge does merge segments in given ranges
