fix: fixes ring.SetAddrs and rebalance race #2283
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AlexanderYastrebov
changed the title
The change ensures atomic update of `c.hash` and `c.shards`. `BenchmarkRingRebalanceLocked` shows rebalance latency: ``` go test . -run=NONE -bench=BenchmarkRingRebalanceLocked -v -count=10 | benchstat /dev/stdin name time/op RingRebalanceLocked-8 8.50µs ±14% ``` (Note: it essentially reverts a46b053)
AlexanderYastrebov
force-pushed
the
ring/fix-set-addrs-rebalance-race
branch
from
7adfdca to
433975c
Compare
AlexanderYastrebov
changed the title
vmihailenco
reviewed
Nov 17, 2022
ring_test.go
Outdated
| return string(h) | ||
| } | ||
|
|
||
| func TestRingSetAddrsAndRebalanceRace(t *testing.T) { |
There was a problem hiding this comment.
Could you please create and move this test to internal_test.go that has package redis so we don't need to export more commands in export_test.go?
There was a problem hiding this comment.
Moved test and benchmark to internal_test.go
| return c.sharding.ShardByName(name) | ||
| } | ||
|
|
||
| func (c *ringSharding) ShardByName(name string) *ringShard { |
There was a problem hiding this comment.
This was only used by above ShardByName
|
Thanks for the fix 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While working on reducing
ring.SetAddrslock contention (see #2190 (comment)) I have discovered a race condition betweenSetAddrsandrebalancewhich I would like to fix first and separately.The change consists of two commits:
The fix ensures atomic update of
c.hashandc.shards, otherwisec.hashmay return shard name that is not in thec.shardsand cause ring operation panic.BenchmarkRingRebalanceLockedshows rebalance latency if that is a concern:(Note: it essentially reverts a46b053)
Updates #2077
FYI @szuecs