backup: fix flaky TestOnlineRestoreDistFlowSplitScatter#168294
Merged
trunk-io[bot] merged 1 commit intocockroachdb:masterfrom Apr 15, 2026
Merged
backup: fix flaky TestOnlineRestoreDistFlowSplitScatter#168294trunk-io[bot] merged 1 commit intocockroachdb:masterfrom
trunk-io[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
The test cleanup cancels a paused download job, but the job may still be in pause-requested state when CANCEL JOB is issued, which rejects it. Wrap the cancel in SucceedsSoon to retry until the job reaches a cancelable state. Also add NewTestingKnobsWithShortIntervals to reduce the job adopt and cancel loop intervals from 30s/10s to 10ms, cutting the test from ~60s to ~2s. Fixes cockroachdb#167692 Release note: None
Contributor
|
😎 Merged successfully - details. |
Member
|
This change is |
kev-cao
approved these changes
Apr 13, 2026
|
Detected infrastructure failure (matched: self-hosted runner lost communication with the server). Automatically rerunning failed jobs. (run link) |
Contributor
Author
|
TFTR! /trunk merge |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The test cleanup cancels a paused download job, but the job may still be in pause-requested state when CANCEL JOB is issued, which rejects it. Wrap the cancel in SucceedsSoon to retry until the job reaches a cancelable state.
Also add NewTestingKnobsWithShortIntervals to reduce the job adopt and cancel loop intervals from 30s/10s to 10ms, cutting the test from ~60s to ~2s.
Fixes #167692
Release note: None