bugfix: When the rollback logic on the TC side returns RollbackFailed…

…, the custom FailureHandler is not executed. (apache#5311)
ZhangShiYeChina · Feb 9, 2023 · 55ba4d0 · 55ba4d0
1 parent eab8c9a
commit 55ba4d0
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java b/tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java
@@ -239,9 +239,29 @@ private void rollbackTransaction(GlobalTransaction tx, Throwable originalExcepti
                     TransactionalExecutor.Code.RollbackFailure, originalException);
         }
 
-        // 3.1 Successfully rolled back
-        throw new TransactionalExecutor.ExecutionException(tx, GlobalStatus.RollbackRetrying.equals(tx.getLocalStatus())
-                ? TransactionalExecutor.Code.RollbackRetrying : TransactionalExecutor.Code.RollbackDone, originalException);
+        //# fix #5231
+        TransactionalExecutor.Code code;
+        switch(tx.getLocalStatus()) {
+            case RollbackFailed:
+            case TimeoutRollbackFailed:
+                code = TransactionalExecutor.Code.RollbackFailure;
+                break;
+            case Rollbacking:
+            case RollbackRetrying:
+                code = TransactionalExecutor.Code.RollbackRetrying;
+                break;
+            case TimeoutRollbacking:
+            case TimeoutRollbackRetrying:
+            case TimeoutRollbacked:
+            case RollbackRetryTimeout:
+                code = TransactionalExecutor.Code.TimeoutRollback;
+                break;
+            case Rollbacked:
+            default:
+                code = TransactionalExecutor.Code.RollbackDone;
+        }
+        throw new TransactionalExecutor.ExecutionException(tx, code, originalException);
+
     }
 
     private void beginTransaction(TransactionInfo txInfo, GlobalTransaction tx) throws TransactionalExecutor.ExecutionException {