Fix a data race in watcher.go #2952
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
blampe
commented
Apr 15, 2024
Comment on lines
+117
to
+118
| o, err := ow.pollFunc() | ||
| results <- result{Obj: o, Err: err} |
There was a problem hiding this comment.
The race was due to this write to obj happening across goroutines. We can instead communicate that state via the results channel.
Does the PR have any schema changes?Looking good! No breaking changes found. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #2952 +/- ##
==========================================
+ Coverage 29.16% 29.18% +0.01%
==========================================
Files 61 61
Lines 8194 8196 +2
==========================================
+ Hits 2390 2392 +2
Misses 5600 5600
Partials 204 204 ☔ View full report in Codecov by Sentry. |
rquitales
reviewed
Apr 15, 2024
provider/pkg/watcher/watcher_test.go
Outdated
| @@ -20,6 +20,7 @@ import ( | |||
| "testing" | |||
| "time" | |||
|
|
|||
| "go.uber.org/atomic" | |||
There was a problem hiding this comment.
Could we use sync/atomic instead?
blampe
added
the
impact/no-changelog-required
rquitales
approved these changes
Apr 15, 2024
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.
Ran into a small data race while testing await logic.
This PR fixes the underlying race condition as well as a race-y test.