Skip to content

Conversation

@kev-cao
Copy link
Contributor

@kev-cao kev-cao commented Dec 23, 2025

Backport 1/1 commits from #160027 on behalf of @kev-cao.


The OR recovery roachtest was failing due to the schemachange workload truncating a table and the roachtest only deleting from the full backup. In certain scenarios, the SST deleted from the full backup would end up being skipped in the restore due to the span it covered never being covered after truncation.

This commit teaches OR to instead delete an SST from every layer of the backup collection, which should make the test resilient to truncation.

Fixes: #159503

Release note: None


Release justification: Test-only change.

The OR recovery roachtest was failing due to the schemachange workload
truncating a table and the roachtest only deleting from the full backup.
In certain scenarios, the SST deleted from the full backup would end up
being skipped in the restore due to the span it covered never being
covered after truncation.

This commit teaches OR to instead delete an SST from every layer of the
backup collection, which should make the test resilient to truncation.

Fixes: cockroachdb#159503

Release note: None
@kev-cao kev-cao force-pushed the blathers/backport-release-25.3-160027 branch from acb9f1d to bbaa441 Compare December 23, 2025 22:59
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Dec 23, 2025
@blathers-crl blathers-crl bot requested a review from msbutler December 23, 2025 22:59
@blathers-crl
Copy link

blathers-crl bot commented Dec 23, 2025

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 blathers-crl bot added backport Label PR's that are backports to older release branches T-disaster-recovery labels Dec 23, 2025
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@blathers-crl blathers-crl bot added the backport-test-only Used to denote the backport has only non-production changes label Dec 23, 2025
@kev-cao kev-cao merged commit a60046c into cockroachdb:release-25.3 Dec 24, 2025
16 checks passed
@kev-cao kev-cao deleted the blathers/backport-release-25.3-160027 branch December 24, 2025 16:53
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 blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. T-disaster-recovery target-release-25.3.8

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants