release-25.4: crosscluster/physical: fix ingest retry progress bug#168337
Merged
trunk-io[bot] merged 2 commits intocockroachdb:release-25.4from Apr 14, 2026
Merged
release-25.4: crosscluster/physical: fix ingest retry progress bug#168337trunk-io[bot] merged 2 commits intocockroachdb:release-25.4from
trunk-io[bot] merged 2 commits intocockroachdb:release-25.4from
Conversation
This commit adds a new helper method LoadClaimedJobWithTxn to the job registry. This method is like LoadClaimedJob but accepts a transaction parameter, allowing callers to reload a claimed job's state within an existing transaction context. This is useful when a job resumer needs to refresh its in-memory view of a job's progress using a specific transaction, while maintaining the proper claimed job semantics (session tracking, registry state). Release note: None Epic: None Co-Authored-By: roachdev-claude <roachdev-claude-bot@cockroachlabs.com>
This patch fixes two bugs in `ingestWithRetries`. 1. the resumer's job never has its in memory progress updated within a single resume, as the frontier processor writes progress updates directly to the db via job id. 2. `previousPersistedSpans` is never updated, which, in combination with the above, means, unless the job is resumed more than once, the branch to reset the retrier is never taken, as they are both always zero-values. The fix is to refresh the resumer's job and update the previous value each loop iteration. Fixes: cockroachdb#167384 Release note: None Co-Authored-By: roachdev-claude <roachdev-claude-bot@cockroachlabs.com>
Contributor
|
😎 Merged successfully - details. |
Member
|
Thanks for opening a backport. Before merging, please confirm that it falls into one of the following categories (select one):
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. |
dt
approved these changes
Apr 14, 2026
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
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.
crosscluster/physical: fix ingest retry progress bug
This patch fixes two bugs in
ingestWithRetries.single resume, as the frontier processor writes progress updates
directly to the db via job id.
previousPersistedSpansis never updated, which, in combination withthe above, means, unless the job is resumed more than once, the
branch to reset the retrier is never taken, as they are both always
zero-values.
The fix is to refresh the resumer's job and update the previous value
each loop iteration.
Fixes: #167384
Release note: None
Co-Authored-By: roachdev-claude roachdev-claude-bot@cockroachlabs.com
Release Justification: low risk bug fix