#1114 - add TX_PREPARING_STATE state for mysql connection in xa trans…

…action (#1130)
actiontech · Apr 23, 2019 · 102515a · 102515a
1 parent b41e73f
commit 102515a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/com/actiontech/dble/DbleServer.java b/src/main/java/com/actiontech/dble/DbleServer.java
@@ -1018,7 +1018,8 @@ private void tryRecovery(CoordinatorLogEntry coordinatorLogEntry, boolean needCo
                     participantLogEntry.getTxState() != TxState.TX_PREPARE_UNCONNECT_STATE &&
                     participantLogEntry.getTxState() != TxState.TX_ROLLBACKING_STATE &&
                     participantLogEntry.getTxState() != TxState.TX_ROLLBACK_FAILED_STATE &&
-                    participantLogEntry.getTxState() != TxState.TX_PREPARED_STATE) {
+                    participantLogEntry.getTxState() != TxState.TX_PREPARED_STATE &&
+                    participantLogEntry.getTxState() != TxState.TX_PREPARING_STATE) {
                 continue;
             }
             finished = false;

diff --git a/...va/com/actiontech/dble/backend/mysql/nio/handler/transaction/xa/XACommitNodesHandler.java b/...va/com/actiontech/dble/backend/mysql/nio/handler/transaction/xa/XACommitNodesHandler.java
@@ -122,6 +122,7 @@ protected boolean executeCommit(MySQLConnection mysqlCon, int position) {
                 }
                 this.debugCommitDelay();
             }
+
             preparePhase(mysqlCon);
         } else if (state == TxState.TX_PREPARED_STATE) {
             if (position == 0) {
@@ -179,6 +180,9 @@ private void preparePhase(MySQLConnection mysqlCon) {
         String xaTxId = mysqlCon.getConnXID(session);
         String rrnName = ((RouteResultsetNode) mysqlCon.getAttachment()).getName();
         XaDelayProvider.delayBeforeXaPrepare(rrnName, xaTxId);
+        // update state of mysql conn to TX_PREPARING_STATE
+        mysqlCon.setXaStatus(TxState.TX_PREPARING_STATE);
+        XAStateLog.saveXARecoveryLog(session.getSessionXaID(), mysqlCon);
         mysqlCon.execCmd("XA PREPARE " + xaTxId);
     }
 
@@ -211,7 +215,7 @@ public void okResponse(byte[] ok, BackendConnection conn) {
                 session.setXaState(TxState.TX_ENDED_STATE);
                 nextParse();
             }
-        } else if (state == TxState.TX_ENDED_STATE) {
+        } else if (state == TxState.TX_PREPARING_STATE) {
             //PREPARE OK
             mysqlCon.setXaStatus(TxState.TX_PREPARED_STATE);
             XAStateLog.saveXARecoveryLog(session.getSessionXaID(), mysqlCon);