Skip to content

[fix](cloud) CloudUpgradeMgr inspect and abort failed conflict txns while waiting (#60830)#66055

Open
deardeng wants to merge 1 commit into
apache:branch-4.1from
deardeng:codex/pick-60830-to-branch-4.1
Open

[fix](cloud) CloudUpgradeMgr inspect and abort failed conflict txns while waiting (#60830)#66055
deardeng wants to merge 1 commit into
apache:branch-4.1from
deardeng:codex/pick-60830-to-branch-4.1

Conversation

@deardeng

Copy link
Copy Markdown
Contributor

pick from #60830

When CloudUpgradeMgr waits for unfinished transactions after registering

watershed txn ids, it now proactively inspects conflict transactions for

the target db/table set and logs sampled txn details for diagnosis.

If enable_abort_txn_by_checking_conflict_txn is enabled, the manager

invokes GlobalTransactionMgr.checkFailedTxns() and aborts failed txns to

reduce the chance of upgrade being blocked by stale/conflicting txns.

Abort failures are handled per txn and do not stop processing the rest.

This commit also adds tests:

  • FE UT CloudUpgradeMgrTest to verify enabled/disabled behavior and

    continue-on-abort-error semantics.

  • cloud multi_cluster docker regression case test_unfinished_txn_2pc.groovy

    to reproduce and validate long-running unfinished 2PC txn behavior.

(cherry picked from commit c6ea360)

What problem does this PR solve?

Issue Number: close #xxx

Related PR: #xxx

Problem Summary:

Release note

None

Check List (For Author)

  • Test

    • Regression test
    • Unit Test
    • Manual test (add detailed scripts or steps below)
    • No need to test or manual test. Explain why:
      • This is a refactor/code format and no logic has been changed.
      • Previous test can cover this change.
      • No code files have been changed.
      • Other reason
  • Behavior changed:

    • No.
    • Yes.
  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

…hile waiting

When CloudUpgradeMgr waits for unfinished transactions after registering

watershed txn ids, it now proactively inspects conflict transactions for

the target db/table set and logs sampled txn details for diagnosis.

If enable_abort_txn_by_checking_conflict_txn is enabled, the manager

invokes GlobalTransactionMgr.checkFailedTxns() and aborts failed txns to

reduce the chance of upgrade being blocked by stale/conflicting txns.

Abort failures are handled per txn and do not stop processing the rest.

This commit also adds tests:

- FE UT CloudUpgradeMgrTest to verify enabled/disabled behavior and

  continue-on-abort-error semantics.

- cloud multi_cluster docker regression case test_unfinished_txn_2pc.groovy

  to reproduce and validate long-running unfinished 2PC txn behavior.

(cherry picked from commit c6ea360)
@deardeng
deardeng requested a review from yiguolei as a code owner July 26, 2026 04:43
@deardeng

Copy link
Copy Markdown
Contributor Author

run buildall

@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?

@hello-stephen

Copy link
Copy Markdown
Contributor

FE UT Coverage Report

Increment line coverage 75.00% (24/32) 🎉
Increment coverage report
Complete coverage report

@hello-stephen

Copy link
Copy Markdown
Contributor

FE Regression Coverage Report

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

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants