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

logic: skip_on_retry works when errors are expected #106738

Conversation

Xiang-Gu
Copy link
Contributor

@Xiang-Gu Xiang-Gu commented Jul 13, 2023

Previously, we have skip_on_retry directive for logic test which, when set, it skips the rest of test if a statement fails with TransactionRetryError. However, it won't skip if the statement is expected to fail with certain error message. This PR ensures that whenever we have a TransactionRetryError and skip_on_retry is set, we always skip the rest of the test, even if the stmt is expected to fail.

fixes #104464

Release note: None

Previously, we have `skip_on_retry` directive for logic test which, when
set, it skips the rest of test if a statement fails with
TransactionRetryError. However, it won't skip if the statement is
expected to fail with certain error message. This PR ensures that
whenever we have a TransactionRetryError and `skip_on_retry` is set, we
always skip the rest of the test, even if the stmt is expected to fail.

Informs cockroachdb#104464

Release note: None
@Xiang-Gu Xiang-Gu added the backport-23.1.x Flags PRs that need to be backported to 23.1 label Jul 13, 2023
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@Xiang-Gu Xiang-Gu marked this pull request as ready for review July 13, 2023 00:34
@Xiang-Gu Xiang-Gu requested a review from rafiss July 13, 2023 00:34
@Xiang-Gu
Copy link
Contributor Author

TFTR!

bors r+

@craig craig bot merged commit b5e9cfd into cockroachdb:master Jul 14, 2023
@craig
Copy link
Contributor

craig bot commented Jul 14, 2023

Build succeeded:

@Xiang-Gu Xiang-Gu deleted the deflake/schema_change_in_txn_TransactionRetryError branch July 14, 2023 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

logictest: schema_change_in_txn failed with TransactionRetryError
3 participants