Skip to content

release-25.2: roachtest: skip revision history and zone config in mixed-version backup on pre-24.1 tenants#170870

Open
dt wants to merge 1 commit into
cockroachdb:release-25.2from
dt:backport25.2-170069
Open

release-25.2: roachtest: skip revision history and zone config in mixed-version backup on pre-24.1 tenants#170870
dt wants to merge 1 commit into
cockroachdb:release-25.2from
dt:backport25.2-170069

Conversation

@dt
Copy link
Copy Markdown
Contributor

@dt dt commented May 24, 2026

Backport 1 of 2 commits from #170069 on behalf of @dt.

(The second commit on the original PR is a CollectionConfig refactor of
infrastructure that does not exist on this branch, so it is omitted.)

Closes #170244.


Zone configuration is not supported in virtual clusters on versions
older than 24.1. When the mixed-version backup test runs with a
multitenant deployment starting from a pre-24.1 version, the
"configure gc policies" step fails with "operation is disabled within
a virtual cluster".

Rather than just skipping the GC TTL configuration, also skip
revision_history backups for these pre-24.1 multitenant runs. The GC
TTL only exists to bound MVCC history accumulation for revision history
backups, so if we're not using revision history, we don't need the TTL
either. AOST restore selection already checks withRevisionHistory() so
it correctly avoids picking an AOST when revision history is not
present.


Release justification: test-only roachtest fix for mixed-version backup pre-24.1 tenants

…kup on pre-24.1 tenants

Zone configuration is not supported in virtual clusters on versions
older than 24.1. When the mixed-version backup test runs with a
multitenant deployment starting from a pre-24.1 version, the
"configure gc policies" step fails with "operation is disabled within
a virtual cluster".

Rather than just skipping the GC TTL configuration, also skip
revision_history backups for these pre-24.1 multitenant runs. The GC
TTL only exists to bound MVCC history accumulation for revision history
backups, so if we're not using revision history, we don't need the TTL
either. AOST restore selection already checks withRevisionHistory() so
it correctly avoids picking an AOST when revision history is not
present.

Fixes: cockroachdb#170244
Epic: none
@blathers-crl
Copy link
Copy Markdown

blathers-crl Bot commented May 24, 2026

Thanks for opening a backport.

Before merging, please confirm that it falls into one of the following categories (select one):

  • Non-production code changes OR fixes for serious issues. Non-production includes test-only changes, build system changes, etc. Serious issues are defined in the policy as correctness, stability, or security issues, data corruption/loss, significant performance regressions, breaking working and widely used functionality, or an inability to detect and debug production issues.
  • Other approved changes. These changes must be gated behind a disabled-by-default feature flag unless there is a strong justification not to. Reference the approved ENGREQ ticket in the PR body (e.g., "Fixes ENGREQ-123").

Add a brief release justification to the PR description explaining your selection.

Also, confirm that the change does not break backward compatibility and complies with all aspects of the backport policy.

All backports must be reviewed by the TL and EM for the owning area.

@trunk-io
Copy link
Copy Markdown
Contributor

trunk-io Bot commented May 24, 2026

Merging to release-25.2 in this repository is managed by Trunk.

  • To merge this pull request, check the box to the left or comment /trunk merge below.

After your PR is submitted to the merge queue, this comment will be automatically updated with its status. If the PR fails, failure details will also be posted here

@blathers-crl blathers-crl Bot added backport Label PR's that are backports to older release branches T-disaster-recovery labels May 24, 2026
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@dt dt requested a review from msbutler May 24, 2026 18:47
@blathers-crl blathers-crl Bot added the backport-test-only Used to denote the backport has only non-production changes label May 24, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Label PR's that are backports to older release branches backport-test-only Used to denote the backport has only non-production changes T-disaster-recovery

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants