refactor the test to not timeout

Signed-off-by: alanprot <[email protected]>

Author: alanprot

pkg/ingester/ingester_test.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"io"
 	"math"
-	"math/rand"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -183,11 +182,7 @@ func TestIngesterDeletionRace(t *testing.T) {
 	limits := defaultLimitsTestConfig()
 	tenantLimits := newMockTenantLimits(map[string]*validation.Limits{userID: &limits})
 	cfg := defaultIngesterTestConfig(t)
-	cfg.BlocksStorageConfig.TSDB.CloseIdleTSDBInterval = 5 * time.Millisecond
-	cfg.BlocksStorageConfig.TSDB.CloseIdleTSDBTimeout = 10 * time.Second
-	cfg.BlocksStorageConfig.TSDB.ExpandedCachingExpireInterval = 5 * time.Millisecond
 	cfg.BlocksStorageConfig.TSDB.PostingsCache = cortex_tsdb.TSDBPostingsCacheConfig{
-		SeedSize: 3, // lets make sure all metric names collide
 		Head: cortex_tsdb.PostingsCacheConfig{
 			Enabled:  true,
 			Ttl:      time.Hour,
@@ -215,7 +210,7 @@ func TestIngesterDeletionRace(t *testing.T) {
 		return ing.lifecycler.GetState()
 	})
 
-	numberOfTenants := 150
+	numberOfTenants := 50
 	wg := sync.WaitGroup{}
 	wg.Add(numberOfTenants)
 
@@ -234,11 +229,27 @@ func TestIngesterDeletionRace(t *testing.T) {
 				Matchers:         []*client.LabelMatcher{{Type: client.REGEX_MATCH, Name: labels.MetricName, Value: ".*"}},
 			}, s)
 			require.NoError(t, err)
-			time.Sleep(time.Duration(rand.Int63n(5)) * time.Millisecond)
+			ing.getTSDB(u).postingCache = &wrappedExpandedPostingsCache{ExpandedPostingsCache: ing.getTSDB(u).postingCache, purgeDelay: 10 * time.Millisecond}
 			ing.getTSDB(u).deletionMarkFound.Store(true) // lets force close the tenant
 		}()
 	}
+
 	wg.Wait()
+
+	ctx, c := context.WithCancel(context.Background())
+	defer c()
+
+	go func() {
+		ing.expirePostingsCache(ctx) //nolint:errcheck
+	}()
+
+	go func() {
+		ing.closeAndDeleteIdleUserTSDBs(ctx) //nolint:errcheck
+	}()
+
+	test.Poll(t, 5*time.Second, 0, func() interface{} {
+		return len(ing.getTSDBUsers())
+	})
 }
 
 func TestIngesterPerLabelsetLimitExceeded(t *testing.T) {
@@ -3592,6 +3603,17 @@ func (m *mockMetricsForLabelMatchersStreamServer) Context() context.Context {
 	return m.ctx
 }
 
+type wrappedExpandedPostingsCache struct {
+	cortex_tsdb.ExpandedPostingsCache
+
+	purgeDelay time.Duration
+}
+
+func (w *wrappedExpandedPostingsCache) PurgeExpiredItems() {
+	time.Sleep(w.purgeDelay)
+	w.ExpandedPostingsCache.PurgeExpiredItems()
+}
+
 type mockQueryStreamServer struct {
 	grpc.ServerStream
 	ctx context.Context