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: deflake TestTrackOnlyUserOpenTransactionsAndActiveStatements #120572

Merged
merged 1 commit into from
Mar 16, 2024

Conversation

rafiss
Copy link
Collaborator

@rafiss rafiss commented Mar 15, 2024

Backport 1/1 commits from #120505.

/cc @cockroachdb/release

Release justification: test only change


This changes the test to block in AfterExecute rather than OnTxnFinish, which should make the active statements assertion less flaky.

It also fixes a testing bug where the SELECT FOR UPDATE was not in a txn.

fixes #120042
fixes #120235
fixes #119829

Release note: None

@rafiss rafiss requested a review from fqazi March 15, 2024 20:14
@rafiss rafiss requested a review from a team as a code owner March 15, 2024 20:14
@rafiss rafiss requested a review from a team March 15, 2024 20:14
@rafiss rafiss requested a review from a team as a code owner March 15, 2024 20:14
@rafiss rafiss requested review from mgartner and removed request for a team March 15, 2024 20:14
Copy link

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

This change is Reviewable

@rafiss rafiss removed the request for review from a team March 15, 2024 20:16
This changes the test to block in AfterExecute rather than OnTxnFinish,
which should make the active statements assertion less flaky.

It also fixes a bug where the SELECT FOR UPDATE was not in a txn.

Release note: None
@rafiss rafiss force-pushed the backport23.1-120505 branch from d121ea8 to f3b82b4 Compare March 15, 2024 20:53
Copy link
Collaborator

@fqazi fqazi left a comment

Choose a reason for hiding this comment

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

Reviewed 5 of 5 files at r1, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @mgartner)

@rafiss rafiss merged commit 81e24af into cockroachdb:release-23.1 Mar 16, 2024
5 of 6 checks passed
@rafiss rafiss deleted the backport23.1-120505 branch March 18, 2024 14:20
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