Skip to content

branch-4.2: [fix](job) Prevent stale cloud broker load retries - #69500

Merged
yiguolei merged 1 commit into
apache:branch-4.2from
sollhui:pick-67250-branch-4.2
Oct 23, 2026
Merged

yiguolei merged 1 commit into
apache:branch-4.2from
sollhui:pick-67250-branch-4.2

Conversation

@sollhui

@sollhui sollhui commented Oct 23, 2026

Copy link
Copy Markdown
Contributor

What problem does this PR solve?

Issue Number: N/A

Related PR: #67250

Problem Summary: Backport #67250 to branch-4.2. Queued Cloud Broker Load tasks could move a job from RETRY back to LOADING, allowing concurrent failures to start multiple retry handlers. An older handler could then revive an already finished job and reuse its VISIBLE transaction. Prevent loading tasks from reopening a retrying attempt and schedule the next PENDING attempt only while the job remains in RETRY.

The test conflict resolution preserves branch-4.2's existing testUpdateStateToFinished implementation and adds the original PR's retry-state test.

Release note

Fix Cloud Broker Load jobs being retried after a later attempt already finished.

Check List (For Author)

  • Test: Compilation and tests skipped as requested. The original PR's focused unit coverage is included. CI requested with run buildall.
  • Behavior changed: Yes. Stale loading tasks and retry handlers cannot reopen a completed Cloud Broker Load attempt.
  • Does this need documentation: No.

@sollhui
sollhui requested a review from yiguolei as a code owner October 23, 2026 03:48
@hello-stephen

Copy link
Copy Markdown
Contributor

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@sollhui

sollhui commented Oct 23, 2026

Copy link
Copy Markdown
Contributor Author

run buildall

@hello-stephen

Copy link
Copy Markdown
Contributor

FE Regression Coverage Report

Increment line coverage 0.00% (0/302) 🎉
Increment coverage report
Complete coverage report

@yiguolei
yiguolei merged commit 2204b4c into apache:branch-4.2 Oct 23, 2026
28 of 30 checks passed
@hello-stephen

Copy link
Copy Markdown
Contributor

FE Regression Coverage Report

Increment line coverage 0.00% (0/331) 🎉
Increment coverage report
Complete coverage report

@github-actions

Copy link
Copy Markdown
Contributor

PR approved by anyone and no changes requested.

@github-actions github-actions Bot added the approved Indicates a PR has been approved by one committer. label Oct 23, 2026
@github-actions

Copy link
Copy Markdown
Contributor

PR approved by at least one committer and no changes requested.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by one committer. reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants