release-25.4: sql: deflake grant_in_txn logictest #160041
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, we would use WaitForOneVersion after grant statements, which would guarantee, and transaction that follows would hit two version invariant errors if the prior version was in use. When we switched these operations to WaitForNewVersion, we can no longer guarantee the next transaction will hit a retry error, if the old version is still in use. This patch, adds logic to wait for a single version in grant_in_txn to avoid the flake. Fixes: cockroachdb#158417 Release note: None
fqazi
force-pushed
the
blathers/backport-release-25.4-160018
branch
from
cd84903 to
4ace972
Compare
blathers-crl
bot
added
blathers-backport
|
Thanks for opening a backport. Before merging, please confirm that the change does not break backwards compatibility and otherwise complies with the backport policy. Include a brief release justification in the PR description explaining why the backport is appropriate. All backports must be reviewed by the TL for the owning area. While the stricter LTS policy does not yet apply, please exercise judgment and consider gating non-critical changes behind a disabled-by-default feature flag when appropriate. |
blathers-crl
bot
added
backport
Member
|
This change is |
blathers-crl
bot
added
backport-failed
backport-test-only
![blathers-crl[bot]](https://avatars.githubusercontent.com/in/59700?s=60&v=4){kind=small}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 #160018 on behalf of @fqazi.
Previously, we would use WaitForOneVersion after grant statements, which would guarantee, and transaction that follows would hit two version invariant errors if the prior version was in use. When we switched these operations to WaitForNewVersion, we can no longer guarantee the next transaction will hit a retry error, if the old version is still in use. This patch, adds logic to wait for a single version in grant_in_txn to avoid the flake.
Fixes: #158417
Release note: None
Release justification: test only change