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-22.2: ttl: do not remove all table TTL settings on RESET (ttl_expire_after) #110750

Merged
merged 3 commits into from
Sep 18, 2023
Merged

release-22.2: ttl: do not remove all table TTL settings on RESET (ttl_expire_after) #110750

merged 3 commits into from
Sep 18, 2023

Conversation

ecwall
Copy link
Contributor

@ecwall ecwall commented Sep 15, 2023 •
edited
Loading

Backport 3/3 commits from #110252.

/cc @cockroachdb/release

Fixes #109138

Previously running RESET (ttl_expire_after) would remove all table TTL
settings if ttl_expiration_expression was set.

This PR fixes the schema changer to only remove all TTL settings on
RESET (ttl).

Release note (bug fix): RESET (ttl_expire_after) no longer incorrectly
removes ttl_expiration_expression.

Release justification: RESET (ttl_expire_after) bug fix.

@ecwall
sql: rename scheduleID to scheduleIDIdx and createStmt to createStmtIdx
69ecb76 
scheduleID and createStmt indexes used to populate slice literals for show
results.

Rename these to avoid accidental usage and to prevent shadowing in the sql
package.

Release note: None
@ecwall
ttl: refactor row_level_ttl logic tests
fb43087 
Split large subtests into smaller subtests to make debugging easier.

Release note: None
@ecwall ecwall requested review from a team as code owners September 15, 2023 21:13
@blathers-crl
Copy link

blathers-crl bot commented Sep 15, 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 15, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@ecwall ecwall requested a review from Xiang-Gu September 15, 2023 21:13
Xiang-Gu
Xiang-Gu approved these changes Sep 18, 2023
View reviewed changes
Copy link
Contributor

@Xiang-Gu Xiang-Gu left a comment

Choose a reason for hiding this comment

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

LGTM pending the CI green

@ecwall
ttl: do not remove all table TTL settings on RESET (ttl_expire_after)
2de77b1 
Fixes #109138

Previously running `RESET (ttl_expire_after)` would remove all table TTL
settings if `ttl_expiration_expression` was set.

This PR fixes the schema changer to only remove all TTL settings on
`RESET (ttl)`.

Release note (bug fix): `RESET (ttl_expire_after)` no longer incorrectly
removes `ttl_expiration_expression`.
@ecwall ecwall merged commit c30cb16 into cockroachdb:release-22.2 Sep 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Xiang-Gu Xiang-Gu Xiang-Gu approved these changes

Assignees
No one assigned
Labels
backport Label PR's that are backports to older release branches
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ecwall @cockroach-teamcity @Xiang-Gu