deardeng opened a new pull request, #66055: URL: https://github.com/apache/doris/pull/66055
pick from https://github.com/apache/doris/pull/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 c6ea36069b03f8db9a31d584364e607be8f097b5) ### What problem does this PR solve? Issue Number: close #xxx Related PR: #xxx Problem Summary: ### Release note None ### Check List (For Author) - Test <!-- At least one of them must be included. --> - [ ] 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 <!-- Add your reason? --> - Behavior changed: - [ ] No. - [ ] Yes. <!-- Explain the behavior change --> - Does this need documentation? - [ ] No. - [ ] Yes. <!-- Add document PR link here. eg: https://github.com/apache/doris-website/pull/1214 --> ### Check List (For Reviewer who merge this PR) - [ ] Confirm the release note - [ ] Confirm test cases - [ ] Confirm document - [ ] Add branch pick label <!-- Add branch pick label that this PR should merge into --> -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
