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

sql: deflake TestReadCommittedStmtRetry #123957

Merged

Conversation

nvanbenschoten
Copy link
Member

Fixes #123661.

This commit deflakes TestReadCommittedStmtRetry by not enabling the hook to block writes in the Read Committed transaction until after the first write. This avoids flakiness if the first write is ever retried due to slowness in the cluster, lease instability, or some other reason.

Release note: None

Fixes cockroachdb#123661.

This commit deflakes `TestReadCommittedStmtRetry` by not enabling the
hook to block writes in the Read Committed transaction until after the
first write. This avoids flakiness if the first write is ever retried
due to slowness in the cluster, lease instability, or some other reason.

Release note: None
@nvanbenschoten nvanbenschoten added backport-23.2.x Flags PRs that need to be backported to 23.2. backport-24.1.x Flags PRs that need to be backported to 24.1. labels May 10, 2024
@nvanbenschoten nvanbenschoten requested a review from a team as a code owner May 10, 2024 18:18
@nvanbenschoten nvanbenschoten requested review from yuzefovich and removed request for a team May 10, 2024 18:18
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

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

nice, thank you for the fix!

@yuzefovich yuzefovich removed their request for review May 11, 2024 00:40
@nvanbenschoten
Copy link
Member Author

TFTR!

bors r+

@craig craig bot merged commit 4cc0bfc into cockroachdb:master May 13, 2024
22 checks passed
Copy link

blathers-crl bot commented May 13, 2024

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 421a23b to blathers/backport-release-23.2-123957: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@nvanbenschoten nvanbenschoten deleted the nvanbenschoten/deflake123661 branch May 20, 2024 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.2.x Flags PRs that need to be backported to 23.2. backport-24.1.x Flags PRs that need to be backported to 24.1.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pkg/ccl/testccl/sqlccl/sqlccl_test: TestReadCommittedStmtRetry failed
3 participants