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-24.2: sql: SHOW CLUSTER SETTING FOR TENANT returns NULL for renamed cluster setting #128784

Merged
merged 1 commit into from
Aug 20, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Aug 12, 2024

Backport 1/1 commits from #128675 on behalf of @stevendanna.

/cc @cockroachdb/release


If a cluster setting has been renamed, the internal key used in the settings tables is different from the name. The lookup code was using the user-facing Name rather than the InternalKey, resulting in SHOW CLUSTER SETTING FOR TENANT returning NULL for settings that had been renamed.

Epic: none
Release note (bug fix): Fix a bug in which SHOW CLUSTER SETTING FOR VIRTUAL CLUSTER would erroneously return NULL for some settings.


Release justification: low risk bug fix

… setting

If a cluster setting has been renamed, the internal key used in the
settings tables is different from the name. The lookup code was using
the user-facing Name rather than the InternalKey, resulting in SHOW
CLUSTER SETTING FOR TENANT returning NULL for settings that had been
renamed.

Epic: none
Release note (bug fix): Fix a bug in which SHOW CLUSTER SETTING FOR
VIRTUAL CLUSTER would erroneously return NULL for some settings.
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-24.2-128675 branch from 66b7814 to 69189ae Compare August 12, 2024 11:54
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Aug 12, 2024
@blathers-crl blathers-crl bot requested review from andy-kimball and rafiss August 12, 2024 11:54
Copy link
Author

blathers-crl bot commented Aug 12, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • 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. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Aug 12, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @andy-kimball and @blathers-crl[bot])


pkg/sql/logictest/testdata/logic_test/cluster_settings line 448 at r1 (raw file):

skipif config 3node-tenant-default-configs
query B
SHOW CLUSTER SETTING sql.explain_analyze.include_ru_estimation.enabled FOR TENANT "cluster-10"

would it be worth adding an assertion for the internal key (SHOW CLUSTER SETTING sql.tenant_ru_estimation.enabled FOR TENANT ...) also?

@rafiss rafiss merged commit 343453c into release-24.2 Aug 20, 2024
19 of 20 checks passed
@rafiss rafiss deleted the blathers/backport-release-24.2-128675 branch August 20, 2024 16:04
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants