Skip to content

Conversation

@fqazi
Copy link
Collaborator

@fqazi fqazi commented Dec 31, 2025

Previously, the schema changer CCL backup / restore tests could timeout due to complex depth of coverage offered. To address this, this patch will avoid testing per-table restore flavors for multiregion and mixed version variants, so that fewer permutations are tested.

Fixes: #160314
Fixes: #160275

Release note: None

@fqazi fqazi requested a review from a team as a code owner December 31, 2025 20:26
@blathers-crl
Copy link

blathers-crl bot commented Dec 31, 2025

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

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

@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.

lgtm!

}, func(t *testing.T, cs CumulativeTestCaseSpec) {
if backupArgs.isMultiRegion {
// Speed up the mixed version multiregion cases by excluding restores of individual
// tables in the mixed version state..
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: double period

@rafiss rafiss added backport-25.4.x Flags PRs that need to be backported to 25.4 backport-26.1.x Flags PRs that need to be backported to 26.1 labels Jan 5, 2026
Previously, the schema changer CCL backup / restore tests could timeout
due to complex depth of coverage offered. To address this, this patch
will avoid testing per-table restore flavors for multiregion and mixed
version variants, so that fewer permutations are tested.

Fixes: cockroachdb#160314
Fixes: cockroachdb#160275

Release note: None
@fqazi fqazi force-pushed the speedUpMixedVersion branch from 0dbe5b5 to 70194cd Compare January 6, 2026 13:43
@fqazi
Copy link
Collaborator Author

fqazi commented Jan 6, 2026

@rafiss TFTR!

bors r+

@craig
Copy link
Contributor

craig bot commented Jan 6, 2026

@craig craig bot merged commit 0fcce4c into cockroachdb:master Jan 6, 2026
25 of 26 checks passed
@blathers-crl
Copy link

blathers-crl bot commented Jan 6, 2026

Based on the specified backports for this PR, I applied new labels to the following linked issue(s). Please adjust the labels as needed to match the branches actually affected by the issue(s), including adding any known older branches.


Issue #160314: branch-release-26.1.


Issue #160275: branch-release-25.4, branch-release-26.1.


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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-25.4.x Flags PRs that need to be backported to 25.4 backport-26.1.x Flags PRs that need to be backported to 26.1 target-release-26.2.0

Projects

None yet

3 participants