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: sql,keys: disregard checks in *ZoneConfig*Batch #110337

Merged
merged 2 commits into from Sep 12, 2023

Conversation

annrpom
Copy link
Contributor

@annrpom annrpom commented Sep 11, 2023

Backport 2/2 commits from #109774.

/cc @cockroachdb/release


Previously, a bug occured where a transactional schema change,
ALTER RANGE default CONFIGURE ZONE..., statement would
produce a CPut failure, even though both statements do take effect.
This was due to a guard in the code that blocked us from adding the
first zone config to the uncommitted cache, causing the expValues
being updated to the KV batch to be the same for both statements.
This patch addresses the issue by removing the check and allowing
for default and psuedotables (like system ranges) to be added to
the uncommitted cache.

Epic: none
Release note (bug fix): two ALTER RANGE default CONFIGURE ZONE
statements on the same line no longer displays an error.
Fixes: #108253
Release justification: small bugfix & update to code

This patch updates the PseudoTableIDs list to replace
`PublicSchemaID` with `SystemPublicSchemaID`; while they
are both the same value, the former is outdated.

Epic: none
Fixes:
Release note: None
Previously, a bug occured where a transactional schema change,
 `ALTER RANGE default CONFIGURE ZONE...`, statement would
produce a CPut failure, even though both statements do take effect.
This was due to a guard in the code that blocked us from adding the
first zone config to the uncommitted cache, causing the expValues
being updated to the KV batch to be the same for both statements.
This patch addresses the issue by removing the check and allowing
for `default` and psuedotables (like system ranges) to be added to
the uncommitted cache.

Epic: none
Release note (bug fix): two `ALTER RANGE default CONFIGURE ZONE`
statements on the same line no longer displays an error.
Fixes: cockroachdb#108253
Release justification: small bugfix
@annrpom annrpom requested review from a team as code owners September 11, 2023 14:24
@blathers-crl
Copy link

blathers-crl bot commented Sep 11, 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 blathers-crl bot added the backport Label PR's that are backports to older release branches label Sep 11, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rafiss rafiss merged commit 8b51791 into cockroachdb:release-23.1 Sep 12, 2023
6 checks passed
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants