fix flaky retention tests (#3976)

grafana · Jul 9, 2021 · 1cca922 · 1cca922
1 parent b830d65
commit 1cca922
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/pkg/storage/stores/shipper/compactor/retention/util_test.go b/pkg/storage/stores/shipper/compactor/retention/util_test.go
@@ -66,7 +66,7 @@ var (
 					RowShards: 16,
 				},
 				{
-					From:       dayFromTime(start.Add(49 * time.Hour)),
+					From:       dayFromTime(start.Add(73 * time.Hour)),
 					IndexType:  "boltdb",
 					ObjectType: "filesystem",
 					Schema:     "v11",
@@ -158,15 +158,13 @@ func (t *testStore) indexTables() []table {
 }
 
 func (t *testStore) HasChunk(c chunk.Chunk) bool {
-	t.t.Helper()
-	var matchers []*labels.Matcher
-	for _, l := range c.Metric {
-		matchers = append(matchers, labels.MustNewMatcher(labels.MatchEqual, l.Name, l.Value))
+	chunks := t.GetChunks(c.UserID, c.From, c.Through, c.Metric)
+
+	chunkIDs := make(map[string]struct{})
+	for _, chk := range chunks {
+		chunkIDs[chk.ExternalKey()] = struct{}{}
 	}
-	chunks, err := t.Store.Get(user.InjectOrgID(context.Background(), c.UserID),
-		c.UserID, c.From, c.Through, matchers...)
-	require.NoError(t.t, err)
-	return len(chunks) == 1 && c.ExternalKey() == chunks[0].ExternalKey()
+	return len(chunkIDs) == 1 && c.ExternalKey() == chunks[0].ExternalKey()
 }
 
 func (t *testStore) GetChunks(userID string, from, through model.Time, metric labels.Labels) []chunk.Chunk {