From f0f76127481d9dd52131904fee8576826423247c Mon Sep 17 00:00:00 2001 From: Jonathan Halterman Date: Fri, 16 Aug 2024 16:15:42 -0700 Subject: [PATCH] Fix occasional race with ring unit test (#569) --- ring/ring_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ring/ring_test.go b/ring/ring_test.go index 95927dbf3..0bedff56c 100644 --- a/ring/ring_test.go +++ b/ring/ring_test.go @@ -3691,11 +3691,15 @@ func TestRing_ShuffleShard_Caching(t *testing.T) { // If we ask for ALL instances, we get a ring with the same instances as the original ring newRing := ring.ShuffleShard("user", numLifecyclers).(*Ring) + ring.mtx.RLock() require.Equal(t, ring.ringDesc.Ingesters, newRing.ringDesc.Ingesters) + ring.mtx.RUnlock() // If we ask for single instance, but use long lookback, we get a ring again with the same instances as the original newRing = ring.ShuffleShardWithLookback("user", 1, 10*time.Minute, time.Now()).(*Ring) + ring.mtx.RLock() require.Equal(t, ring.ringDesc.Ingesters, newRing.ringDesc.Ingesters) + ring.mtx.RUnlock() } // User shuffle shard token.