Skip to content

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Oct 3, 2025

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


The current TestRestoreCheckpointing waits for job progress to be updated by sleeping for a duration greater than the checkpoint interval. While this works the vast majority of the time, if the test cluster is overloaded, it is not sufficient and we can end up resuming the job before the progress was updated. This results in more spans being processed than expected.

This commit updates the test to instead check the contents of the job progress checkpoint and wait until the checkpoint contains all processed spans from before the pause.

Fixes: #153848

Release note: None


Release justification: Test-only change.

The current `TestRestoreCheckpointing` waits for job progress to be
updated by sleeping for a duration greater than the checkpoint interval.
While this works the vast majority of the time, if the test cluster is
overloaded, it is not sufficient and we can end up resuming the job
before the progress was updated. This results in more spans being
processed than expected.

This commit updates the test to instead check the contents of the job
progress checkpoint and wait until the checkpoint contains all processed
spans from before the pause.

Fixes: #153848

Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner October 3, 2025 16:55
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-25.2-154654 branch from 52c7f51 to ffd6e64 Compare October 3, 2025 16:55
@blathers-crl blathers-crl bot added the blathers-backport This is a backport that Blathers created automatically. label Oct 3, 2025
@blathers-crl blathers-crl bot removed the request for review from a team October 3, 2025 16:55
@blathers-crl blathers-crl bot added the O-robot Originated from a bot. label Oct 3, 2025
@blathers-crl blathers-crl bot requested a review from jeffswenson October 3, 2025 16:55
Copy link
Author

blathers-crl bot commented Oct 3, 2025

Thanks for opening a backport.

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

  • Non-production code changes. Includes test-only changes, build system changes, etc.
  • Fixes for serious issues. 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.

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.

@blathers-crl blathers-crl bot requested a review from msbutler October 3, 2025 16:55
@blathers-crl blathers-crl bot added backport Label PR's that are backports to older release branches T-disaster-recovery labels Oct 3, 2025
Copy link
Author

blathers-crl bot commented Oct 3, 2025

✅ PR #154758 is compliant with backport policy

Confidence: high
Backward compatible: true
Explanation: The pull request targets release-25.2 branch and modifies pkg/backup/backup_test.go, which is a test-only file (recognized by its _test.go suffix). According to the backport policy, changes that only affect non-production code, such as tests, are exempt from the standard backport policy criteria. Additionally, the PR body explicitly states 'Release justification: Test-only change.', which matches the exception criteria for test-only changes in the backport policy. Thus, the PR is compliant, as it accurately follows the exemption rules for test-only modifications.

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

@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 Oct 3, 2025
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants