bugfix:fix wrong exception information when rollback fails due to dir…

…ty data (apache#2333)
dockerDo · Mar 7, 2020 · 21e0355 · 21e0355
1 parent 826a725
commit 21e0355
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionalInterceptor.java b/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionalInterceptor.java
@@ -154,6 +154,9 @@ public TransactionInfo getTransactionInfo() {
                 case RollbackFailure:
                     failureHandler.onRollbackFailure(e.getTransaction(), e.getCause());
                     throw e.getCause();
+                case RollbackRetrying:
+                    failureHandler.onRollbackRetrying(e.getTransaction(), e.getCause());
+                    throw e.getCause();
                 default:
                     throw new ShouldNeverHappenException(String.format("Unknown TransactionalExecutor.Code: %s", code));
 

diff --git a/tm/src/main/java/io/seata/tm/api/DefaultFailureHandlerImpl.java b/tm/src/main/java/io/seata/tm/api/DefaultFailureHandlerImpl.java
@@ -22,6 +22,7 @@
 import io.netty.util.TimerTask;
 import io.seata.common.thread.NamedThreadFactory;
 import io.seata.core.exception.TransactionException;
+import io.seata.core.logger.StackTraceLogger;
 import io.seata.core.model.GlobalStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,6 +68,13 @@ public void onRollbackFailure(GlobalTransaction tx, Throwable cause) {
         timer.newTimeout(new CheckTimerTask(tx, GlobalStatus.Rollbacked), SCHEDULE_INTERVAL_SECONDS, TimeUnit.SECONDS);
     }
 
+    @Override
+    public void onRollbackRetrying(GlobalTransaction tx, Throwable cause) {
+        StackTraceLogger.warn(LOGGER, cause, "Retrying to rollback transaction[{}]", new String[] {tx.getXid()});
+        timer.newTimeout(new CheckTimerTask(tx, GlobalStatus.RollbackRetrying), SCHEDULE_INTERVAL_SECONDS,
+            TimeUnit.SECONDS);
+    }
+
     protected class CheckTimerTask implements TimerTask {
 
         private final GlobalTransaction tx;

diff --git a/tm/src/main/java/io/seata/tm/api/FailureHandler.java b/tm/src/main/java/io/seata/tm/api/FailureHandler.java
@@ -45,4 +45,12 @@ public interface FailureHandler {
      * @param cause the cause
      */
     void onRollbackFailure(GlobalTransaction tx, Throwable cause);
+
+    /**
+     * On rollback retrying
+     *
+     * @param tx    the tx
+     * @param cause the cause
+     */
+    void onRollbackRetrying(GlobalTransaction tx, Throwable cause);
 }
diff --git a/tm/src/main/java/io/seata/tm/api/TransactionalExecutor.java b/tm/src/main/java/io/seata/tm/api/TransactionalExecutor.java
@@ -72,7 +72,13 @@ enum Code {
          * Report failure code.
          */
         //
-        ReportFailure
+        ReportFailure,
+
+        /**
+         * Rollback retrying code.
+         */
+        //
+        RollbackRetrying
     }
 
     /**

diff --git a/tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java b/tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java
@@ -20,6 +20,7 @@
 import io.seata.common.util.StringUtils;
 import io.seata.core.context.RootContext;
 import io.seata.core.exception.TransactionException;
+import io.seata.core.model.GlobalStatus;
 import io.seata.tm.api.transaction.Propagation;
 import io.seata.tm.api.transaction.TransactionHook;
 import io.seata.tm.api.transaction.TransactionHookManager;
@@ -143,7 +144,9 @@ private void rollbackTransaction(GlobalTransaction tx, Throwable ex) throws Tran
         tx.rollback();
         triggerAfterRollback();
         // 3.1 Successfully rolled back
-        throw new TransactionalExecutor.ExecutionException(tx, TransactionalExecutor.Code.RollbackDone, ex);
+        throw new TransactionalExecutor.ExecutionException(tx,
+            tx.getStatus().equals(GlobalStatus.RollbackRetrying) ? TransactionalExecutor.Code.RollbackRetrying :
+                TransactionalExecutor.Code.RollbackDone, ex);
     }
 
     private void beginTransaction(TransactionInfo txInfo, GlobalTransaction tx) throws TransactionalExecutor.ExecutionException {