[test] Merge pull request #13790 from aknuds1/arve/retention-commit

tsdb.BeyondTimeRetention: Fix comment and test at retention duration

tsdb/db.go

@@ -1609,7 +1609,7 @@ func BeyondTimeRetention(db *DB, blocks []*Block) (deletable map[ulid.ULID]struc
 
 	deletable = make(map[ulid.ULID]struct{})
 	for i, block := range blocks {
-		// The difference between the first block and this block is larger than
+		// The difference between the first block and this block is greater than or equal to
 		// the retention period so any blocks after that are added as deletable.
 		if i > 0 && blocks[0].Meta().MaxTime-block.Meta().MaxTime >= db.opts.RetentionDuration {
 			for _, b := range blocks[i:] {

tsdb/db_test.go

@@ -681,34 +681,6 @@ func TestDB_Snapshot(t *testing.T) {
 	require.Equal(t, 1000.0, sum)
 }
 
-func TestDB_BeyondTimeRetention(t *testing.T) {
-	opts := DefaultOptions()
-	opts.RetentionDuration = 100
-	db := openTestDB(t, opts, nil)
-	defer func() {
-		require.NoError(t, db.Close())
-	}()
-
-	// We have 4 blocks, 3 of which are beyond the retention duration.
-	metas := []BlockMeta{
-		{MinTime: 300, MaxTime: 500},
-		{MinTime: 200, MaxTime: 300},
-		{MinTime: 100, MaxTime: 200},
-		{MinTime: 0, MaxTime: 100},
-	}
-
-	for _, m := range metas {
-		createBlock(t, db.Dir(), genSeries(1, 1, m.MinTime, m.MaxTime))
-	}
-
-	// Reloading should truncate the 3 blocks which are >= the retention period.
-	require.NoError(t, db.reloadBlocks())
-	blocks := db.Blocks()
-	require.Len(t, blocks, 1)
-	require.Equal(t, metas[0].MinTime, blocks[0].Meta().MinTime)
-	require.Equal(t, metas[0].MaxTime, blocks[0].Meta().MaxTime)
-}
-
 // TestDB_Snapshot_ChunksOutsideOfCompactedRange ensures that a snapshot removes chunks samples
 // that are outside the set block time range.
 // See https://github.com/prometheus/prometheus/issues/5105
@@ -1491,34 +1463,66 @@ func (*mockCompactorFailing) CompactOOO(string, *OOOCompactionHead) (result []ul
 }
 
 func TestTimeRetention(t *testing.T) {
+	testCases := []struct {
+		name              string
+		blocks            []*BlockMeta
+		expBlocks         []*BlockMeta
+		retentionDuration int64
+	}{
+		{
+			name: "Block max time delta greater than retention duration",
+			blocks: []*BlockMeta{
+				{MinTime: 500, MaxTime: 900}, // Oldest block, beyond retention
+				{MinTime: 1000, MaxTime: 1500},
+				{MinTime: 1500, MaxTime: 2000}, // Newest block
+			},
+			expBlocks: []*BlockMeta{
+				{MinTime: 1000, MaxTime: 1500},
+				{MinTime: 1500, MaxTime: 2000},
+			},
+			retentionDuration: 1000,
+		},
+		{
+			name: "Block max time delta equal to retention duration",
+			blocks: []*BlockMeta{
+				{MinTime: 500, MaxTime: 900},   // Oldest block
+				{MinTime: 1000, MaxTime: 1500}, // Coinciding exactly with the retention duration.
+				{MinTime: 1500, MaxTime: 2000}, // Newest block
+			},
+			expBlocks: []*BlockMeta{
+				{MinTime: 1500, MaxTime: 2000},
+			},
+			retentionDuration: 500,
+		},
+	}
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
 			db := openTestDB(t, nil, []int64{1000})
 			defer func() {
 				require.NoError(t, db.Close())
 			}()
 
-	blocks := []*BlockMeta{
+			for _, m := range tc.blocks {
-		{MinTime: 500, MaxTime: 900}, // Oldest block
-		{MinTime: 1000, MaxTime: 1500},
-		{MinTime: 1500, MaxTime: 2000}, // Newest Block
-	}
-
-	for _, m := range blocks {
 				createBlock(t, db.Dir(), genSeries(10, 10, m.MinTime, m.MaxTime))
 			}
 
 			require.NoError(t, db.reloadBlocks())       // Reload the db to register the new blocks.
-	require.Equal(t, len(blocks), len(db.Blocks())) // Ensure all blocks are registered.
+			require.Len(t, db.Blocks(), len(tc.blocks)) // Ensure all blocks are registered.
 
-	db.opts.RetentionDuration = blocks[2].MaxTime - blocks[1].MinTime
+			db.opts.RetentionDuration = tc.retentionDuration
+			// Reloading should truncate the blocks which are >= the retention duration vs the first block.
 			require.NoError(t, db.reloadBlocks())
 
-	expBlocks := blocks[1:]
 			actBlocks := db.Blocks()
 
 			require.Equal(t, 1, int(prom_testutil.ToFloat64(db.metrics.timeRetentionCount)), "metric retention count mismatch")
-	require.Equal(t, len(expBlocks), len(actBlocks))
+			require.Len(t, actBlocks, len(tc.expBlocks))
-	require.Equal(t, expBlocks[0].MaxTime, actBlocks[0].meta.MaxTime)
+			for i, eb := range tc.expBlocks {
-	require.Equal(t, expBlocks[len(expBlocks)-1].MaxTime, actBlocks[len(actBlocks)-1].meta.MaxTime)
+				require.Equal(t, eb.MinTime, actBlocks[i].meta.MinTime)
+				require.Equal(t, eb.MaxTime, actBlocks[i].meta.MaxTime)
+			}
+		})
+	}
 }
 
 func TestRetentionDurationMetric(t *testing.T) {