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: fix flake in TestTxnContentionEventsTable #118808

Merged
merged 1 commit into from
Feb 7, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Feb 6, 2024

Backport 1/1 commits from #118372 on behalf of @michae2.

/cc @cockroachdb/release


In causeContention we deliberately hold a transaction open using pg_sleep to block an update statement. The timing we're trying to achieve is:

  1. transaction insert
  2. update starts and blocks
  3. transaction held open using pg_sleep

We were using a WaitGroup to order (2) after (1), but there was no synchronization to ensure (3) came after (2).

This commit adds a retry loop that checks crdb_internal.cluster_queries to ensure (3) comes after (2).

Fixes: #118236

Release note: None


Release justification: test-only fix for a flake.

In causeContention we deliberately hold a transaction open using
pg_sleep to block an update statement. The timing we're trying to
achieve is:

1. transaction insert
2. update starts and blocks
3. transaction held open using pg_sleep

We were using a WaitGroup to order (2) after (1), but there was no
synchronization to ensure (3) came after (2).

This commit adds a retry loop that checks
`crdb_internal.cluster_queries` to ensure (3) comes after (2).

Fixes: #118236

Release note: None
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-118372 branch from ea90edf to a0cb448 Compare February 6, 2024 01:48
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Feb 6, 2024
Copy link
Author

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

This change is Reviewable

Copy link
Member

@yuzefovich yuzefovich left a comment

Choose a reason for hiding this comment

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

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

@michae2
Copy link
Collaborator

michae2 commented Feb 7, 2024

This is a test-only change. Merging.

@michae2 michae2 merged commit a78f72d into release-23.2 Feb 7, 2024
5 of 6 checks passed
@michae2 michae2 deleted the blathers/backport-release-23.2-118372 branch February 7, 2024 18:04
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.

3 participants