Fix data race (accessing charmInfo) in TestV2CharmExitsApplicationWorker #13211
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
|
|
Merged
jujubot
added a commit
that referenced
this pull request
Aug 8, 2021
#13220 Merge 2.9 #13211 Fix data race (accessing charmInfo) in TestV2CharmExitsApplicationWorker #13212 Fix retry-provisioning command #13210 Add note and todo #13209 Improve readablity of 'no prdesc not found' error message #13214 Adds remaining authorization objects to ignore #13215 Use a key-based mutex lock to download resources/agent bins once #13218 Show application data set by the remote app in show-unit output #13219 Add impish to the ubuntu series list Trivial conflicts in imports/code comments. ``` Conflicts: # apiserver/facades/client/client/client.go # apiserver/facades/schema.json # resource/resourceadapters/opener.go ``` ## QA steps See PRs
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.
This fixes a data race accessing the charmInfo returned by the mocked
ApplicationCharmInfofunction. This was happening because we synchronize by waiting for theApplicationCharmInfocall itself, but then write tocharmInfostraight away, and thecharmFormat()function may not be finished reading it yet, causing a data race.The fix removes the first call to
ApplicationCharmInfoin the application worker (there's no need to call it twice), and then waits for the main worker'sLife()call to synchronize and know when the worker has definitely finished thecharmFormat()call before changingcharmInfofields.See
go test -race ./worker/caasunitprovisioner/output here.