-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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-22.2: logictestccl: Fix regional_by_row_query_behavior flake #105787
release-22.2: logictestccl: Fix regional_by_row_query_behavior flake #105787
Conversation
Thanks for opening a backport. Please check the backport criteria before merging:
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
Add a brief release justification to the body of your PR to justify this backport. Some other things to consider:
|
Fixes cockroachdb#86284 This fixes a test flake in regional_by_row_query_behavior which is caused by 2 issues: 1. Zone configs not becoming available in `SystemConfig` between table creation time and query execution time. 2. Metamorphic testing modify the `coldata-batch-size` setting, causing a different number of kv reads to be done, which affects the kv trace results in this test. The flake can be reproduced via the command: ``` ./dev testlogic ccl --files=regional_by_row_query_behavior \ --config=multiregion-9node-3region-3azs --stress ``` For point 1, the `retry` logic test directive is enhanced to purge the zone config cache in the SystemConfig when a failing test is retried, allowing the updated zone config to be read. For point 2, the logic test blocking flag `!metamorphic` which resets batch size related settings that were modified in metamorphic mode back to their default production values, is updated to also cover the `coldata-batch-size` setting. The flag is renamed to `!metamorphic-batch-sizes` to better reflect its actual effect. Release justification: low risk fix for test flake Release note: None
Fixes cockroachdb#88398 This fixes a panic which can occur duing cluster startup in a logic test or during retry of a test case in a logic test when an attempt is made to purge the zone config cache and no SystemConfig is available. Release note: None
Previously, by mistake we were acquiring a read lock even though we do write operations in `PurgeZoneConfigCache`. Release note: None
This commit backports code needed to fix cockroachdb#104466. Informs: cockroachdb#104466 Release note: None
93ccffa
to
e5e341e
Compare
This adds a retry command to logic tests which may be issued on a separate line preceding either a "statement" or "query" command. It causes the statement to be retried with exponential backoff up to some maximum duration, e.g. ``` retry statement error column "non_exist" does not exist ALTER TABLE created_as_global SET LOCALITY REGIONAL BY ROW AS "non_exist" ``` This has the same effect as the retry option of the query command, but now also supports "statement ok", "statement error" and "query error" commands. Retry of a query command may be specified by the standalone retry command, the retry option of the query command, or both. Fixes: cockroachdb#95668 Epic: CRDB-20535 Release note: None
This commit adds more retries to multiregion logic tests. Fixes cockroachdb#104466 Release note: None
e5e341e
to
1785349
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 16 of 16 files at r1, 2 of 2 files at r2, 1 of 1 files at r3, 1 of 1 files at r4, 1 of 1 files at r5, 3 of 3 files at r6, all commit messages.
Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @msirek)
TFTR! |
Backport:
Please see individual PRs for details.
/cc @cockroachdb/release
logictest: only purge zone configs for in-memory test clusters
This commit backports code needed to fix #104466.
Informs: #104466
Release note: None
logictest: retry support for "statement" and "query" commands
This adds a retry command to logic tests which may be issued on a
separate line preceding either a "statement" or "query" command.
It causes the statement to be retried with exponential backoff up
to some maximum duration, e.g.
This has the same effect as the retry option of the query command, but
now also supports "statement ok", "statement error" and "query error"
commands.
Retry of a query command may be specified by the standalone retry
command, the retry option of the query command, or both.
Fixes: #95668
Epic: CRDB-20535
Release note: None
logictest: retry support for "statement" and "query" commands
This adds a retry command to logic tests which may be issued on a
separate line preceding either a "statement" or "query" command.
It causes the statement to be retried with exponential backoff up
to some maximum duration, e.g.
This has the same effect as the retry option of the query command, but
now also supports "statement ok", "statement error" and "query error"
commands.
Retry of a query command may be specified by the standalone retry
command, the retry option of the query command, or both.
Fixes: #95668
Epic: CRDB-20535
Release note: None
logictestccl: add more retries to logic tests
This commit adds more retries to multiregion logic tests.
Fixes #104466
Release note: None
Release justification: Fix #104466