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

apache · Dec 9, 2023 · d1aa1ca · d1aa1ca
1 parent 471d413
commit d1aa1ca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -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

diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -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线程，增加线程休眠时长

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -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>

diff --git a/server/src/main/java/io/seata/server/coordinator/DefaultCore.java b/server/src/main/java/io/seata/server/coordinator/DefaultCore.java
@@ -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) {