Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix: the branch transaction order error when rolling back #6121

Merged
merged 3 commits into from
Dec 9, 2023
Merged

bugfix: the branch transaction order error when rolling back #6121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02ea19b
bugfix: the branch transaction order error when rolling back
funky-eyes Dec 9, 2023
81e4d84
bugfix: the branch transaction order error when rolling back
funky-eyes Dec 9, 2023
85c61f5
Merge branch '2.x' into fix_sortbranch
funky-eyes Dec 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/en-us/2.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6086](https://github.com/seata/seata/pull/6086)] fix oracle column alias cannot find
- [[#6085](https://github.com/seata/seata/pull/6085)] fix jdk9+ compile error
- [[#6077](https://github.com/seata/seata/pull/6077)] fix could not rollback when table with multiple primary
- [[#6121](https://github.com/seata/seata/pull/6121)] fix the branch transaction order error when rolling back

### optimize:
- [[#6061](https://github.com/seata/seata/pull/6061)] merge the rpcMergeMessageSend threads of rm and tm and increase the thread hibernation duration
Expand Down
1 change: 1 addition & 0 deletions changes/zh-cn/2.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- [[#6086](https://github.com/seata/seata/pull/6086)] 修复oracle alias 解析异常
- [[#6085](https://github.com/seata/seata/pull/6085)] 修复jdk9+版本编译后，引入后ByteBuffer#flip NoSuchMethodError的问题
- [[#6077](https://github.com/seata/seata/pull/6077)] 修复表存在复合主键索引导致无法回滚问题
- [[#6121](https://github.com/seata/seata/pull/6121)] 修复回滚分支事务时没有按照时间排序的问题

### optimize:
- [[#6061](https://github.com/seata/seata/pull/6061)] 合并rm和tm的rpcMergeMessageSend线程，增加线程休眠时长
Expand Down
2 changes: 1 addition & 1 deletion dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<kotlin-coroutines.version>1.4.3</kotlin-coroutines.version>

<!-- # for test -->
<mockito.version>4.5.1</mockito.version>
<mockito.version>4.11.0</mockito.version>
<assertj-core.version>3.12.2</assertj-core.version>
<jetty-version>9.4.38.v20210224</jetty-version>
<janino-version>3.1.7</janino-version>
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/io/seata/server/coordinator/DefaultCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ public boolean doGlobalRollback(GlobalSession globalSession, boolean retrying) t
if (globalSession.isSaga()) {
success = getCore(BranchType.SAGA).doGlobalRollback(globalSession, retrying);
} else {
List<BranchSession> branchSessions = globalSession.getSortedBranches();
List<BranchSession> branchSessions = globalSession.getReverseSortedBranches();
Boolean result = SessionHelper.forEach(branchSessions, branchSession -> {
BranchStatus currentBranchStatus = branchSession.getStatus();
if (currentBranchStatus == BranchStatus.PhaseOne_Failed) {
Expand Down
Loading