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

Merged
merged 1 commit into from
Mar 15, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Mar 15, 2024

Backport 1/1 commits from #120505 on behalf of @rafiss.

/cc @cockroachdb/release


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


Release justification: test only change

@blathers-crl blathers-crl bot requested a review from a team as a code owner March 15, 2024 19:52
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-120505 branch from 2186f56 to 227c6a1 Compare March 15, 2024 19:52
@blathers-crl blathers-crl bot requested review from a team as code owners March 15, 2024 19:52
@blathers-crl blathers-crl bot requested a review from a team March 15, 2024 19:52
@blathers-crl blathers-crl bot requested a review from a team as a code owner March 15, 2024 19:52
@blathers-crl blathers-crl bot requested review from msbutler and removed request for a team March 15, 2024 19:52
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Mar 15, 2024
Copy link
Author

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 requested review from rytaft and removed request for a team March 15, 2024 19:52
@blathers-crl blathers-crl bot requested review from abarganier and fqazi March 15, 2024 19:52
@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 request for a team, msbutler, rytaft and abarganier 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 blathers/backport-release-23.2-120505 branch from 227c6a1 to edaa2ef Compare March 15, 2024 20:52
@rafiss rafiss merged commit e31b35b into release-23.2 Mar 15, 2024
5 of 6 checks passed
@rafiss rafiss deleted the blathers/backport-release-23.2-120505 branch March 15, 2024 21:40
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.

2 participants