Skip to content

Commit b9ed799

Browse files
sudeepdino008wmitsuda
authored andcommitted
publishable: move overlap check before, else it's reported as gap (#18692)
1 parent b8fca9b commit b9ed799

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

cmd/utils/app/snapshots_cmd.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,18 +1575,18 @@ func doBlockSnapshotsRangeCheck(snapDir string, suffix string, snapType string)
15751575
if intervals[0].from != 0 {
15761576
return fmt.Errorf("gap at start: snapshots start at (%d-%d). snaptype: %s", intervals[0].from, intervals[0].to, snapType)
15771577
}
1578-
// Check that there are no gaps
1579-
for i := 1; i < len(intervals); i++ {
1580-
if intervals[i].from != intervals[i-1].to {
1581-
return fmt.Errorf("gap between (%d-%d) and (%d-%d). snaptype: %s", intervals[i-1].from, intervals[i-1].to, intervals[i].from, intervals[i].to, snapType)
1582-
}
1583-
}
15841578
// Check that there are no overlaps
15851579
for i := 1; i < len(intervals); i++ {
15861580
if intervals[i].from < intervals[i-1].to {
15871581
return fmt.Errorf("overlap between (%d-%d) and (%d-%d). snaptype: %s", intervals[i-1].from, intervals[i-1].to, intervals[i].from, intervals[i].to, snapType)
15881582
}
15891583
}
1584+
// Check that there are no gaps
1585+
for i := 1; i < len(intervals); i++ {
1586+
if intervals[i].from != intervals[i-1].to {
1587+
return fmt.Errorf("gap between (%d-%d) and (%d-%d). snaptype: %s", intervals[i-1].from, intervals[i-1].to, intervals[i].from, intervals[i].to, snapType)
1588+
}
1589+
}
15901590

15911591
return nil
15921592

0 commit comments

Comments
 (0)