optimize: branch transaction repeated reporting false (apache#1633)

ggndnn · Sep 17, 2019 · ebcae5f · ebcae5f
1 parent 520c5ca
commit ebcae5f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/AbstractDMLBaseExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/AbstractDMLBaseExecutor.java
@@ -95,7 +95,9 @@ protected T executeAutoCommitTrue(Object[] args) throws Throwable {
         } catch (Exception e) {
             // when exception occur in finally,this exception will lost, so just print it here
             LOGGER.error("execute executeAutoCommitTrue error:{}", e.getMessage(), e);
-            connectionProxy.rollback();
+            if (!LockRetryPolicy.isLockRetryPolicyBranchRollbackOnConflict()) {
+                connectionProxy.getTargetConnection().rollback();
+            }
             throw e;
         } finally {
             ((ConnectionProxy) connectionProxy).getContext().reset();
@@ -140,5 +142,9 @@ public <T> T execute(Callable<T> callable) throws Exception {
         protected void onException(Exception e) throws Exception {
             connection.rollback();
         }
+
+        public static boolean isLockRetryPolicyBranchRollbackOnConflict() {
+            return LOCK_RETRY_POLICY_BRANCH_ROLLBACK_ON_CONFLICT;
+        }
     }
 }
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/exec/AbstractDMLBaseExecutorTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/AbstractDMLBaseExecutorTest.java
@@ -83,10 +83,9 @@ public void testLockRetryPolicyRollbackOnConflict() throws Exception {
         boolean oldBranchRollbackFlag = (boolean) branchRollbackFlagField.get(null);
         branchRollbackFlagField.set(null, true);
         Assertions.assertThrows(LockWaitTimeoutException.class, executor::execute);
-        Mockito.verify(connectionProxy, Mockito.times(1))
-                .rollback();
         Mockito.verify(connectionProxy.getTargetConnection(), Mockito.atLeastOnce())
                 .rollback();
+        Mockito.verify(connectionProxy, Mockito.never()).rollback();
         branchRollbackFlagField.set(null, oldBranchRollbackFlag);
     }
 
@@ -95,10 +94,8 @@ public void testLockRetryPolicyNotRollbackOnConflict() throws Throwable {
         boolean oldBranchRollbackFlag = (boolean) branchRollbackFlagField.get(null);
         branchRollbackFlagField.set(null, false);
         Assertions.assertThrows(LockConflictException.class, executor::execute);
-        Mockito.verify(connectionProxy, Mockito.times(1))
-                .rollback();
-        Mockito.verify(connectionProxy.getTargetConnection(), Mockito.never())
-                .rollback();
+        Mockito.verify(connectionProxy.getTargetConnection(), Mockito.times(1)).rollback();
+        Mockito.verify(connectionProxy, Mockito.never()).rollback();
         branchRollbackFlagField.set(null, oldBranchRollbackFlag);
     }
 }