diff --git a/src/main/java/com/actiontech/dble/net/IOProcessor.java b/src/main/java/com/actiontech/dble/net/IOProcessor.java index bd0b905bd..87a19902c 100644 --- a/src/main/java/com/actiontech/dble/net/IOProcessor.java +++ b/src/main/java/com/actiontech/dble/net/IOProcessor.java @@ -17,7 +17,6 @@ import com.actiontech.dble.net.connection.FrontendConnection; import com.actiontech.dble.net.connection.PooledConnection; import com.actiontech.dble.services.mysqlauthenticate.MySQLBackAuthService; import com.actiontech.dble.services.mysqlsharding.ShardingService; -import com.actiontech.dble.singleton.XASessionCheck; import com.actiontech.dble.statistic.CommandCount; import com.actiontech.dble.util.TimeUtil; import org.slf4j.Logger; @@ -153,13 +152,8 @@ public final class IOProcessor { ShardingService s = (ShardingService) c.getService(); String xaStage = s.getSession2().getTransactionManager().getXAStage(); if (xaStage != null) { - if (!xaStage.equals(XAStage.COMMIT_FAIL_STAGE)) { - // Active/IDLE/PREPARED XA FrontendS will be rollbacked + if (!xaStage.equals(XAStage.COMMIT_FAIL_STAGE) && !xaStage.equals(XAStage.ROLLBACK_FAIL_STAGE)) { s.getConnection().close("Close Timeout"); - XASessionCheck.getInstance().addRollbackSession(s.getSession2()); - } else { - s.getConnection().close("Close Timeout"); - XASessionCheck.getInstance().addCommitSession(s.getSession2()); } continue; } @@ -173,9 +167,7 @@ public final class IOProcessor { String xaStage = s.getSession2().getTransactionManager().getXAStage(); if (xaStage != null) { if (!xaStage.equals(XAStage.COMMIT_FAIL_STAGE) && !xaStage.equals(XAStage.ROLLBACK_FAIL_STAGE)) { - // Active/IDLE/PREPARED XA FrontendS will be rollbacked s.getConnection().close("Idle Timeout"); - XASessionCheck.getInstance().addRollbackSession(s.getSession2()); } continue; } diff --git a/src/main/java/com/actiontech/dble/singleton/XASessionCheck.java b/src/main/java/com/actiontech/dble/singleton/XASessionCheck.java index ef4ba7abf..9d29b0e78 100644 --- a/src/main/java/com/actiontech/dble/singleton/XASessionCheck.java +++ b/src/main/java/com/actiontech/dble/singleton/XASessionCheck.java @@ -63,7 +63,7 @@ public final class XASessionCheck { return commitSession; } - public ConcurrentMap getRollbackingSession() { + public ConcurrentMap getRollbackSession() { return rollbackSession; } @@ -71,7 +71,7 @@ public final class XASessionCheck { return committingSession; } - public ConcurrentMap getRollbackSession() { + public ConcurrentMap getRollbackingSession() { return rollbackingSession; }