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.2: sql: mark implicit transactions with AOST as read-only #120158

Merged
merged 2 commits into from
Mar 11, 2024

Conversation

michae2
Copy link
Collaborator

@michae2 michae2 commented Mar 8, 2024

Backport 2/2 commits from #120097.

/cc @cockroachdb/release


sql: mark implicit transactions with AOST as read-only

In handleAOST we were setting the transaction AOST but not marking it as read-only. It needs to also be marked as read-only to disallow mutation statements and locking statements.

Fixes: #120081

Release note (sql change): Mutation statements such as UPDATE and DELETE as well as locking statements such as SELECT FOR UPDATE are not allowed in read-only transactions or AS OF SYSTEM TIME transactions. Fix an oversight where we were allowing mutation statements and locking statements in implicit single-statement transactions using AS OF SYSTEM TIME.


sql: disallow SET transaction_read_only = false during AOST txn

Fixes: #44200

Release note (bug fix): Fix a bug in which it was possible to SET transaction_read_only = false during an AS OF SYSTEM TIME transaction.


Release justification: add a missing check preventing undefined combination of AOST and mutation statements.

@michae2 michae2 requested review from mgartner and rafiss March 8, 2024 22:02
@michae2 michae2 requested a review from a team as a code owner March 8, 2024 22:02
Copy link

blathers-crl bot commented Mar 8, 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 and one additional
    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 Mar 8, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@michae2
Copy link
Collaborator Author

michae2 commented Mar 8, 2024

Hold off for a sec, I need to fix it.

michae2 added 2 commits March 8, 2024 14:25
In `handleAOST` we were setting the transaction AOST but not marking it
as read-only. It needs to also be marked as read-only to disallow
mutation statements and locking statements.

Fixes: cockroachdb#120081

Release note (sql change): Mutation statements such as UPDATE and DELETE
as well as locking statements such as SELECT FOR UPDATE are not allowed
in read-only transactions or AS OF SYSTEM TIME transactions. Fix an
oversight where we were allowing mutation statements and locking
statements in implicit single-statement transactions using AS OF SYSTEM
TIME.
Fixes: cockroachdb#44200

Release note (bug fix): Fix a bug in which it was possible to `SET
transaction_read_only = false` during an AS OF SYSTEM TIME transaction.
@michae2 michae2 force-pushed the backport23.2-120097 branch from c97dfe5 to 4f05854 Compare March 8, 2024 22:25
@michae2 michae2 merged commit 824ee32 into cockroachdb:release-23.2 Mar 11, 2024
5 of 6 checks passed
@michae2 michae2 deleted the backport23.2-120097 branch March 11, 2024 18:42
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.

4 participants