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

[pull] master from cortexproject:master #669

Merged
merged 2 commits into from
Jan 6, 2025
Merged

Conversation

pull[bot]
Copy link

@pull pull bot commented Jan 6, 2025

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

yeya24 and others added 2 commits January 6, 2025 10:10
Copied from grafana/dskit#336

Fixes a race condition during setup for Client.Watch tests where a
conditional variable broadcast was missed by the caller waiting on
the conditional variable.

Verified by running the tests many times with a timeout:

```
go test -timeout=10s -count=10000 -run=TestMockKV_Watch ./pkg/ring/kv/etcd/
```

Fixes:
- #6478
- #5564

Signed-off-by: Charlie Le <[email protected]>
@pull pull bot added the ⤵️ pull label Jan 6, 2025
@pull pull bot merged commit 42028f7 into yeya24:master Jan 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants