Skip to content
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: server: fix a race in tenant creation #107764

Merged
merged 1 commit into from
Jul 28, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jul 27, 2023

Backport 1/1 commits from #107666 on behalf of @lidorcarmel.

/cc @cockroachdb/release


Previously, scanTenantsForRunnableServices() was not holding the mutex when SELECTing for the existing tenant names, which means that the following may happen:

  • scanTenantsForRunnableServices() sees that only the system tenant exists
  • createServerEntryLocked() then adds another tenant while holding the mutex
  • scanTenantsForRunnableServices() takes the lock and stops the tenant that was just created because only the system tenant should be alive (which is wrong)

This patch changes scanTenantsForRunnableServices() to take the mutex before SELECTing for the existing tenants in order to avoid the race.

Epic: none
Fixes: #107434
Fixes: #107343
Fixes: #107154

Release note: None


Release justification: fixing flaky tests

@blathers-crl blathers-crl bot requested a review from a team as a code owner July 27, 2023 22:51
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-107666 branch 2 times, most recently from de4b5e3 to 372b999 Compare July 27, 2023 22:51
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jul 27, 2023
@blathers-crl
Copy link
Author

blathers-crl bot commented Jul 27, 2023

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@blathers-crl
Copy link
Author

blathers-crl bot commented Jul 27, 2023

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.

@blathers-crl blathers-crl bot requested a review from knz July 27, 2023 22:51
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Previously, scanTenantsForRunnableServices() was not holding the mutex when
SELECTing for the existing tenant names, which means that the following may
happen:
- scanTenantsForRunnableServices() sees that only the system tenant exists
- createServerEntryLocked() then adds another tenant while holding the mutex
- scanTenantsForRunnableServices() takes the lock and stops the tenant that
  was just created because only the system tenant should be alive (which
  is wrong)

This patch changes scanTenantsForRunnableServices() to take the mutex before
SELECTing for the existing tenants in order to avoid the race.

Epic: none
Fixes: #107434

Release note: None
@lidorcarmel lidorcarmel force-pushed the blathers/backport-release-23.1-107666 branch from 372b999 to 966699e Compare July 28, 2023 16:35
@lidorcarmel lidorcarmel merged commit b575a64 into release-23.1 Jul 28, 2023
2 checks passed
@lidorcarmel lidorcarmel deleted the blathers/backport-release-23.1-107666 branch July 28, 2023 17:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants