release-23.2: sqlccl: de-flake TestActiveCancelSession #124574
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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:pg_sleep
query that is intended to run foreverCANCEL 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 thepg_sleep
query, and in both cases this would result inconnection reset by peer
error which is not what the test expects. This race is now fixed by blocking conn2 until it sees thepg_sleep
query in the SHOW CLUSTER QUERIES output.Fixes: #123639.
Release note: None
Release justification: test-only change.