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

cli: avoid generating ballast files for standalone SQL servers #92767

Merged
merged 1 commit into from
Nov 30, 2022

Conversation

knz
Copy link
Contributor

@knz knz commented Nov 30, 2022

Fixes #92500.

In a previous PR, we merged the startup code path between cockroach start and cockroach mt start-sql. Doing so also (mostly) merged the default store config. This was incorrect, as standalone SQL servers should not receive an emergency ballast.

This patch fixes that.

Release note: None

In a previous PR, we merged the startup code path between `cockroach
start` and `cockroach mt start-sql`. Doing so also (mostly) merged the
default store config. This was incorrect, as standalone SQL servers
should not receive an emergency ballast.

This patch fixes that.

Release note: None
@knz knz added A-multitenancy Related to multi-tenancy T-multitenant Issues owned by the multi-tenant virtual team labels Nov 30, 2022
@knz knz requested a review from a team as a code owner November 30, 2022 20:37
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@knz
Copy link
Contributor Author

knz commented Nov 30, 2022

TFYR!

bors r=jaylim-crl

@craig
Copy link
Contributor

craig bot commented Nov 30, 2022

Build succeeded:

@craig craig bot merged commit 5ae6412 into cockroachdb:master Nov 30, 2022
@knz knz deleted the 20221130-ballast branch November 30, 2022 22:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-multitenancy Related to multi-tenancy T-multitenant Issues owned by the multi-tenant virtual team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Secondary tenants should not be started with an EMERGENCY_BALLAST file
3 participants