-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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
release-23.1: sql/license: Fix data race in license/enforcer.go #130095
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
There is a data race in TestQueryCache related to license/enforcer.go. This test is unique because it runs parallel tests that start a mock server, going through the SQL startup code. Since the license enforcer is a singleton, each parallel goroutine shares the same enforcer object. This commit addresses two issues: 1. The Enforcer.db variable can be set twice and is otherwise unprotected. Since the db is only needed during setup, I’ve removed the variable from the struct for now. I may need to reintroduce it later, but I’ll ensure it doesn’t break this test when I do. 2. The creation of the singleton in GetEnforcerInstance can cause a data race on the instance variable. While there is a once.Do call to generate the singleton, there was an unnecessary instance == nil check before it. I’ve removed this check to prevent the data race. Epic: CRDB-39988 Closes: #130034 Release note: None
blathers-crl
bot
force-pushed
the
blathers/backport-release-23.1-130036
branch
from
September 4, 2024 17:16
434f9b0
to
d6155d9
Compare
blathers-crl
bot
added
blathers-backport
This is a backport that Blathers created automatically.
O-robot
Originated from a bot.
labels
Sep 4, 2024
Thanks for opening a backport. Please check the backport criteria before merging:
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
Also, please add a brief release justification to the body of your PR to justify this |
blathers-crl
bot
added
the
backport
Label PR's that are backports to older release branches
label
Sep 4, 2024
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
mgartner
approved these changes
Sep 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport
Label PR's that are backports to older release branches
blathers-backport
This is a backport that Blathers created automatically.
O-robot
Originated from a bot.
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.
Backport 1/1 commits from #130036 on behalf of @spilchen.
/cc @cockroachdb/release
There is a data race in TestQueryCache related to license/enforcer.go. This test is unique because it runs parallel tests that start a mock server, going through the SQL startup code. Since the license enforcer is a singleton, each parallel goroutine shares the same enforcer object. This commit addresses two issues:
The Enforcer.db variable can be set twice and is otherwise unprotected. Since the db is only needed during setup, I’ve removed the variable from the struct for now. I may need to reintroduce it later, but I’ll ensure it doesn’t break this test when I do.
The creation of the singleton in GetEnforcerInstance can cause a data race on the instance variable. While there is a once.Do call to generate the singleton, there was an unnecessary instance == nil check before it. I’ve removed this check to prevent the data race.
Epic: CRDB-39988
Closes: #130034
Release note: None
Release justification: This work is part of the CockroachDB core deprecation.