Skip to content

Commit

Permalink
Fix occasional race with ring unit test (#569)
Browse files Browse the repository at this point in the history
  • Loading branch information
jhalterman authored Aug 16, 2024
1 parent cbfe0ab commit f0f7612
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions ring/ring_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit f0f7612

Please sign in to comment.