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.

Sign up for GitHub

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

Jump to bottom

release-23.1: sql: add an advisory check between default_tenant and alter tenant #105211

Merged
merged 1 commit into from
Jun 21, 2023
Merged

release-23.1: sql: add an advisory check between default_tenant and alter tenant #105211

merged 1 commit into from
Jun 21, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jun 20, 2023 •
edited by knz
Loading

Backport 1/1 commits from #105116 on behalf of @knz.

/cc @cockroachdb/release

Fixes #105115.
Epic: CRDB-26691

Prior to this patch, it was just too easy to mistakenly configure default_tenant to a non-existent tenant or one without service; or to disable the service for a tenant currently serving default traffic.

This patch makes this mistake harder, by adding a coherence check between the cluster setting and the service mode.

The coherence check can be disabled via the (new) cluster setting server.controller.default_tenant.check_service.enabled.

Release note: None

Release justification: prevents a footgun in operator UX

@knz
sql: add an advisory check between default_tenant and alter tenant
7d7bc95 
Prior to this patch, it was just too easy to mistakenly configure
`default_tenant` to a non-existent tenant or one without service;
or to disable the service for a tenant currently serving default
traffic.

This patch makes this mistake harder, by adding a coherence check
between the cluster setting and the service mode.

The coherence check can be disabled via the (new) cluster setting
`server.controller.default_tenant.check_service.enabled`.

Release note: None
@blathers-crl blathers-crl bot requested review from a team as code owners June 20, 2023 17:41
@blathers-crl blathers-crl bot requested a review from a team June 20, 2023 17:41
@blathers-crl blathers-crl bot requested review from a team as code owners June 20, 2023 17:41
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jun 20, 2023
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-105116 branch from 6a6603f to 7d7bc95 Compare June 20, 2023 17:41
@blathers-crl
Copy link
Author

blathers-crl bot commented Jun 20, 2023 •
edited by knz
Loading

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?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@knz knz merged commit 6e2f434 into release-23.1 Jun 21, 2023
@knz knz deleted the blathers/backport-release-23.1-105116 branch June 21, 2023 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@knz knz knz approved these changes

Assignees

@knz knz

Labels
blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cockroach-teamcity @knz