Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix occasional race with ring unit test #569

Merged
merged 1 commit into from
Aug 16, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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