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: sqlccl: de-flake TestActiveCancelSession #124574

Merged
merged 1 commit into from
May 23, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented May 22, 2024

Backport 1/1 commits from #124564 on behalf of @yuzefovich.

/cc @cockroachdb/release


This commit fixes a possible race in TestActiveCancelSession. In particular, that test uses two connections in the following manner:

  • conn1 runs pg_sleep query that is intended to run forever
  • conn2 executes CANCEL SESSION for conn1.

Since pg_sleep query is executed in a separate goroutine, previously it was possible for CANCEL SESSION statement to be issued before either the separate goroutine was spun up or it began executing the pg_sleep query, and in both cases this would result in connection reset by peer error which is not what the test expects. This race is now fixed by blocking conn2 until it sees the pg_sleep query in the SHOW CLUSTER QUERIES output.

Fixes: #123639.

Release note: None


Release justification: test-only change.

This commit fixes a possible race in `TestActiveCancelSession`. In
particular, that test uses two connections in the following manner:
- conn1 runs `pg_sleep` query that is intended to run forever
- conn2 executes `CANCEL SESSION` for conn1.

Since `pg_sleep` query is executed in a separate goroutine, previously
it was possible for CANCEL SESSION statement to be issued before either
the separate goroutine was spun up or it began executing the `pg_sleep`
query, and in both cases this would result in `connection reset by peer`
error which is not what the test expects. This race is now fixed by
blocking conn2 until it sees the `pg_sleep` query in the SHOW CLUSTER
QUERIES output.

Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner May 22, 2024 19:57
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-124564 branch from 3105ed1 to 01ca48c Compare May 22, 2024 19:57
@blathers-crl blathers-crl bot requested review from yuzefovich and removed request for a team May 22, 2024 19:57
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels May 22, 2024
@blathers-crl blathers-crl bot requested a review from michae2 May 22, 2024 19:57
Copy link
Author

blathers-crl bot commented May 22, 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 rafiss and a team May 22, 2024 19:57
@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label May 22, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@yuzefovich yuzefovich merged commit 59ec42d into release-23.2 May 23, 2024
5 of 6 checks passed
@yuzefovich yuzefovich deleted the blathers/backport-release-23.2-124564 branch May 23, 2024 02:44
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