Merge pull request #13197 from bboreham/tsdb-lint

Clean up some issues in tsdb tests

tsdb/compact_test.go

@@ -1575,12 +1575,13 @@ func TestHeadCompactionWithHistograms(t *testing.T) {
 func TestSparseHistogramSpaceSavings(t *testing.T) {
 	t.Skip()
 
-	cases := []struct {
+	type testcase struct {
 		numSeriesPerSchema int
 		numBuckets         int
 		numSpans           int
 		gapBetweenSpans    int
-	}{
+	}
+	cases := []testcase{
 		{1, 15, 1, 0},
 		{1, 50, 1, 0},
 		{1, 100, 1, 0},
@@ -1692,7 +1693,7 @@ func TestSparseHistogramSpaceSavings(t *testing.T) {
 				}()
 
 				wg.Add(1)
-				go func() {
+				go func(c testcase) {
 					defer wg.Done()
 
 					// Ingest histograms the old way.
@@ -1740,7 +1741,7 @@ func TestSparseHistogramSpaceSavings(t *testing.T) {
 					oldULIDs, err = compactor.Write(oldHead.opts.ChunkDirRoot, oldHead, mint, maxt, nil)
 					require.NoError(t, err)
 					require.Len(t, oldULIDs, 1)
-				}()
+				}(c)
 
 				wg.Wait()
 

tsdb/db_test.go

@@ -426,8 +426,8 @@ func TestDeleteSimple(t *testing.T) {
 		},
 	}
 
-Outer:
 	for _, c := range cases {
+		t.Run("", func(t *testing.T) {
 			db := openTestDB(t, nil, nil)
 			defer func() {
 				require.NoError(t, db.Close())
@@ -471,7 +471,7 @@ Outer:
 
 				if !eok {
 					require.Empty(t, res.Warnings())
-				continue Outer
+					break
 				}
 				sexp := expss.At()
 				sres := res.At()
@@ -484,6 +484,7 @@ Outer:
 				require.Equal(t, errExp, errRes)
 				require.Equal(t, smplExp, smplRes)
 			}
+		})
 	}
 }
 
@@ -759,8 +760,8 @@ func TestDB_SnapshotWithDelete(t *testing.T) {
 		},
 	}
 
-Outer:
 	for _, c := range cases {
+		t.Run("", func(t *testing.T) {
 			// TODO(gouthamve): Reset the tombstones somehow.
 			// Delete the ranges.
 			for _, r := range c.intervals {
@@ -795,7 +796,7 @@ Outer:
 
 			if len(expSamples) == 0 {
 				require.False(t, res.Next())
-			continue
+				return
 			}
 
 			for {
@@ -804,7 +805,7 @@ Outer:
 
 				if !eok {
 					require.Empty(t, res.Warnings())
-				continue Outer
+					break
 				}
 				sexp := expss.At()
 				sres := res.At()
@@ -817,6 +818,7 @@ Outer:
 				require.Equal(t, errExp, errRes)
 				require.Equal(t, smplExp, smplRes)
 			}
+		})
 	}
 }
 
@@ -2250,6 +2252,7 @@ func TestDB_LabelNames(t *testing.T) {
 		require.NoError(t, err)
 	}
 	for _, tst := range tests {
+		t.Run("", func(t *testing.T) {
 			ctx := context.Background()
 			db := openTestDB(t, nil, nil)
 			defer func() {
@@ -2293,6 +2296,7 @@ func TestDB_LabelNames(t *testing.T) {
 			require.Empty(t, ws)
 			require.NoError(t, q.Close())
 			require.Equal(t, tst.exp2, labelNames)
+		})
 	}
 }
 

tsdb/head_test.go

@@ -1594,7 +1594,6 @@ func TestDelete_e2e(t *testing.T) {
 		for i := 0; i < numRanges; i++ {
 			q, err := NewBlockQuerier(hb, 0, 100000)
 			require.NoError(t, err)
-			defer q.Close()
 			ss := q.Select(context.Background(), true, nil, del.ms...)
 			// Build the mockSeriesSet.
 			matchedSeries := make([]storage.Series, 0, len(matched))
@@ -1635,6 +1634,7 @@ func TestDelete_e2e(t *testing.T) {
 			}
 			require.NoError(t, ss.Err())
 			require.Empty(t, ss.Warnings())
+			require.NoError(t, q.Close())
 		}
 	}
 }

tsdb/head_wal.go

@@ -694,9 +694,9 @@ func (h *Head) loadWBL(r *wlog.Reader, syms *labels.SymbolTable, multiRef map[ch
 
 	go func() {
 		defer close(decodedCh)
-		var err error
 		dec := record.NewDecoder(syms)
 		for r.Next() {
+			var err error
 			rec := r.Record()
 			switch dec.Type(rec) {
 			case record.Samples:

tsdb/querier_test.go

@@ -2633,6 +2633,8 @@ func BenchmarkSetMatcher(b *testing.B) {
 	}
 
 	for _, c := range cases {
+		benchMsg := fmt.Sprintf("nSeries=%d,nBlocks=%d,cardinality=%d,pattern=\"%s\"", c.numSeries, c.numBlocks, c.cardinality, c.pattern)
+		b.Run(benchMsg, func(b *testing.B) {
 			dir := b.TempDir()
 
 			var (
@@ -2667,8 +2669,6 @@ func BenchmarkSetMatcher(b *testing.B) {
 			sq := storage.NewMergeQuerier(qblocks, nil, storage.ChainedSeriesMerge)
 			defer sq.Close()
 
-		benchMsg := fmt.Sprintf("nSeries=%d,nBlocks=%d,cardinality=%d,pattern=\"%s\"", c.numSeries, c.numBlocks, c.cardinality, c.pattern)
-		b.Run(benchMsg, func(b *testing.B) {
 			b.ResetTimer()
 			b.ReportAllocs()
 			for n := 0; n < b.N; n++ {