fix(registry/etcdv3): guard dataListener.interestedURL with RWMutex - #3545
Closed
Aias00 wants to merge 1 commit into
Closed
fix(registry/etcdv3): guard dataListener.interestedURL with RWMutex#3545Aias00 wants to merge 1 commit into
Aias00 wants to merge 1 commit into
Conversation
dataListener.interestedURL was a plain slice with no lock; AddInterestedURL appends from the DoSubscribe path while DataChange reads it on the etcd watch goroutine, racing the slice header. Add a sync.RWMutex: AddInterestedURL takes the write lock; DataChange does the ContainsFunc check under RLock and dispatches Process outside the lock. Fixes apache#3544 Co-Authored-By: Claude <noreply@anthropic.com>
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #3545 +/- ##
===========================================
+ Coverage 46.76% 55.32% +8.55%
===========================================
Files 295 462 +167
Lines 17172 36002 +18830
===========================================
+ Hits 8031 19918 +11887
- Misses 8287 14527 +6240
- Partials 854 1557 +703 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
This file contains hidden or 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
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.



What
dataListener.interestedURLwas a plain slice with no lock;AddInterestedURLappends from theDoSubscribepath whileDataChangereads it (slices.ContainsFunc) on the etcd watch goroutine, racing the slice header.Why
Two near-simultaneous
DoSubscribecalls, or a subscribe concurrent with an incoming etcd watch event, race on the slice header → torn reads, missed event matching.go test -raceflags it.Fix
Add a
sync.RWMutextodataListener.AddInterestedURLtakes the write lock;DataChangedoes theContainsFunccheck underRLock, releases it, then dispatchesProcessoutside the lock.Tests
Added
Test_dataListener_ConcurrentAddAndDataChange: 100 rounds of concurrentAddInterestedURLvsDataChange, passing under-race.registry/etcdv3passes under-race.Fixes #3544