feature: retry when tm commit or rollback failed (#1739)

apache · Oct 10, 2019 · 71aa79d · 71aa79d
1 parent b2d695f
commit 71aa79d
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 3 deletions.
diff --git a/codec/seata-codec-seata/src/test/resources/file.conf b/codec/seata-codec-seata/src/test/resources/file.conf
@@ -44,6 +44,8 @@ client {
     retry.times = 30
   }
   report.retry.count = 5
+  tm.commit.retry.count = 1
+  tm.rollback.retry.count = 1
 }
 
 transaction {

diff --git a/config/seata-config-core/src/main/resources/file.conf b/config/seata-config-core/src/main/resources/file.conf
@@ -44,6 +44,8 @@ client {
     retry.times = 30
   }
   report.retry.count = 5
+  tm.commit.retry.count = 1
+  tm.rollback.retry.count = 1
   #schedule check table meta
   table.meta.check.enable = true
 }

diff --git a/core/src/main/java/io/seata/core/constants/ConfigurationKeys.java b/core/src/main/java/io/seata/core/constants/ConfigurationKeys.java
@@ -108,6 +108,15 @@ public class ConfigurationKeys {
      */
     public static final String CLIENT_TABLE_META_CHECK_ENABLE  = CLIENT_PREFIX + "table.meta.check.enable";
 
+    /**
+     * The constant CLIENT_TM_COMMIT_RETRY_TIMES.
+     */
+    public static final String CLIENT_TM_COMMIT_RETRY_COUNT = CLIENT_PREFIX + "tm.commit.retry.count";
+
+    /**
+     * The constant CLIENT_TM_ROLLBACK_RETRY_TIMES.
+     */
+    public static final String CLIENT_TM_ROLLBACK_RETRY_COUNT = CLIENT_PREFIX + "tm.rollback.retry.count";
 
     /**
      * The constant SERIALIZE_FOR_RPC.

diff --git a/server/src/main/resources/file.conf b/server/src/main/resources/file.conf
@@ -47,6 +47,8 @@ client {
     retry.times = 30
   }
   report.retry.count = 5
+  tm.commit.retry.count = 1
+  tm.rollback.retry.count = 1
 }
 
 ## transaction log store

diff --git a/server/src/main/resources/nacos-config.txt b/server/src/main/resources/nacos-config.txt
@@ -21,6 +21,9 @@ client.lock.retry.internal=10
 client.lock.retry.times=30
 client.lock.retry.policy.branch-rollback-on-conflict=true
 client.table.meta.check.enable=true
+client.report.retry.count=5
+client.tm.commit.retry.count=1
+client.tm.rollback.retry.count=1
 store.mode=file
 store.file.dir=file_store/data
 store.file.max-branch-session-size=16384

diff --git a/test/src/test/resources/file.conf b/test/src/test/resources/file.conf
@@ -44,6 +44,8 @@ client {
     retry.times = 30
   }
   report.retry.count = 5
+  tm.commit.retry.count = 1
+  tm.rollback.retry.count = 1
 }
 transaction {
   undo.data.validation = true

diff --git a/tm/src/main/java/io/seata/tm/api/DefaultGlobalTransaction.java b/tm/src/main/java/io/seata/tm/api/DefaultGlobalTransaction.java
@@ -16,6 +16,8 @@
 package io.seata.tm.api;
 
 import io.seata.common.exception.ShouldNeverHappenException;
+import io.seata.config.ConfigurationFactory;
+import io.seata.core.constants.ConfigurationKeys;
 import io.seata.core.context.RootContext;
 import io.seata.core.exception.TransactionException;
 import io.seata.core.model.GlobalStatus;
@@ -45,6 +47,12 @@ public class DefaultGlobalTransaction implements GlobalTransaction {
 
     private GlobalTransactionRole role;
 
+    private static final int COMMIT_RETRY_COUNT = ConfigurationFactory.getInstance().getInt(
+        ConfigurationKeys.CLIENT_TM_COMMIT_RETRY_COUNT, 1);
+
+    private static final int ROLLBACK_RETRY_COUNT = ConfigurationFactory.getInstance().getInt(
+        ConfigurationKeys.CLIENT_TM_ROLLBACK_RETRY_COUNT, 1);
+
     /**
      * Instantiates a new Default global transaction.
      */
@@ -112,9 +120,20 @@ public void commit() throws TransactionException {
         if (xid == null) {
             throw new IllegalStateException();
         }
-
+        int retry = COMMIT_RETRY_COUNT;
         try {
-            status = transactionManager.commit(xid);
+            while (retry > 0) {
+                try {
+                    status = transactionManager.commit(xid);
+                    break;
+                } catch (Throwable ex) {
+                    LOGGER.error("Failed to report global commit [{}],Retry Countdown: {}, reason: {}", this.getXid(), retry, ex.getMessage());
+                    retry--;
+                    if (retry == 0) {
+                        throw new TransactionException("Failed to report global commit", ex);
+                    }
+                }
+            }
         } finally {
             if (RootContext.getXID() != null) {
                 if (xid.equals(RootContext.getXID())) {
@@ -141,8 +160,20 @@ public void rollback() throws TransactionException {
             throw new IllegalStateException();
         }
 
+        int retry = ROLLBACK_RETRY_COUNT;
         try {
-            status = transactionManager.rollback(xid);
+            while (retry > 0) {
+                try {
+                    status = transactionManager.rollback(xid);
+                    break;
+                } catch (Throwable ex) {
+                    LOGGER.error("Failed to report global rollback [{}],Retry Countdown: {}, reason: {}", this.getXid(), retry, ex.getMessage());
+                    retry--;
+                    if (retry == 0) {
+                        throw new TransactionException("Failed to report global rollback", ex);
+                    }
+                }
+            }
         } finally {
             if (RootContext.getXID() != null) {
                 if (xid.equals(RootContext.getXID())) {