txc fix

Author: ujued

example/spring-demo-client/src/main/resources/application-codingapi.properties

@@ -0,0 +1,7 @@
+#spring.cloud.consul.discovery.health-check-url=http://127.0.0.1:${server.port}/actuator/health
+spring.datasource.password=123456
+
+spring.datasource.hikari.maximum-pool-size=5
+
+tx-lcn.logger.enabled=true
+

example/spring-demo-d/src/main/java/com/codingapi/example/demod/SpringDApplication.java

@@ -16,5 +16,6 @@ public class SpringDApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(SpringDApplication.class, args);
+
     }
 }

example/spring-demo-d/src/main/java/com/codingapi/example/demod/service/impl/DemoServiceImpl.java

@@ -31,6 +31,7 @@ public class DemoServiceImpl implements DemoService {
 
     @Override
     @TxcTransaction(dtxp = DTXPropagation.SUPPORTS)
+    @Transactional
     public String rpc(String value) {
         Demo demo = new Demo();
         demo.setCreateTime(new Date());

example/spring-demo-d/src/main/resources/application-codingapi.properties

@@ -0,0 +1,6 @@
+#spring.cloud.consul.discovery.health-check-url=http://127.0.0.1:${server.port}/actuator/health
+spring.datasource.password=123456
+
+spring.datasource.hikari.maximum-pool-size=5
+
+tx-lcn.logger.enabled=true

example/spring-demo-e/src/main/resources/application-codingapi.properties

@@ -0,0 +1,6 @@
+#spring.cloud.consul.discovery.health-check-url=http://127.0.0.1:${server.port}/actuator/health
+spring.datasource.password=123456
+
+spring.datasource.hikari.maximum-pool-size=5
+
+tx-lcn.logger.enabled=true

tx-client/pom.xml

@@ -71,6 +71,12 @@
             <artifactId>spring-tx</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

tx-client/src/main/java/com/codingapi/tx/client/TxClientConfiguration.java

@@ -39,6 +39,7 @@ public TxcSettingFactory txcSettingFactory() {
         return new DefaultTxcSettingFactory();
     }
 
+
     @Bean
     public SmartInitializingSingleton dtxCheckingTransactionCleanTemplateAdapter(DTXChecking dtxChecking,
                                                                                  TransactionCleanTemplate transactionCleanTemplate) {

tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/control/TxcRunningTransaction.java

@@ -3,13 +3,15 @@
 import com.codingapi.tx.client.bean.DTXLocal;
 import com.codingapi.tx.client.bean.TxTransactionInfo;
 import com.codingapi.tx.client.spi.transaction.txc.resource.def.TxcService;
+import com.codingapi.tx.client.support.message.TxMangerReporter;
 import com.codingapi.tx.client.support.separate.TXLCNTransactionControl;
 import com.codingapi.tx.client.support.common.template.TransactionCleanTemplate;
 import com.codingapi.tx.client.support.common.template.TransactionControlTemplate;
 import com.codingapi.tx.client.spi.transaction.txc.resource.def.bean.RollbackInfo;
 import com.codingapi.tx.commons.exception.TransactionClearException;
 import com.codingapi.tx.commons.exception.TxClientException;
 import com.codingapi.tx.commons.exception.TxcLogicException;
+import com.codingapi.tx.logger.TxLogger;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -30,6 +32,11 @@ public class TxcRunningTransaction implements TXLCNTransactionControl {
 
     private final TransactionControlTemplate transactionControlTemplate;
 
+    @Autowired
+    private TxMangerReporter txMangerReporter;
+
+    @Autowired
+    private TxLogger txLogger;
 
     @Autowired
     public TxcRunningTransaction(TxcService txcService,
@@ -71,7 +78,15 @@ public void onBusinessCodeSuccess(TxTransactionInfo info, Object result) throws
             txcService.writeUndoLog(
                     info.getGroupId(), info.getUnitId(), (RollbackInfo) DTXLocal.cur().getAttachment());
         } catch (TxcLogicException e) {
-            throw new TxClientException(e);
+            //执行回滚处理。（启用备用连接池的方式）
+            try {
+                RollbackInfo rollbackInfo = (RollbackInfo) DTXLocal.cur().getAttachment();
+                txLogger.trace(info.getGroupId(), info.getUnitId(), "txc", "exception rollbackInfo sql " + rollbackInfo.toString());
+                txcService.undoRollbackInfo(rollbackInfo);
+            } catch (TxcLogicException e1) {
+                txMangerReporter.reportTxcRollbackException(info.getGroupId(), info.getUnitId());
+            }
+            throw new TxClientException("txc rollback fail.");
         }
         // 加入事务组
         transactionControlTemplate.joinGroup(info.getGroupId(), info.getUnitId(), info.getTransactionType(),

tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/resource/TxcServiceImpl.java

@@ -225,4 +225,13 @@ public void undo(String groupId, String unitId) throws TxcLogicException {
             DTXLocal.undoProxyStatus();
         }
     }
+
+    @Override
+    public void undoRollbackInfo(RollbackInfo rollbackInfo) throws TxcLogicException {
+        try {
+            txcSqlExecutor.undoRollbackInfoSql(rollbackInfo);
+        } catch (SQLException e) {
+            throw new TxcLogicException(e);
+        }
+    }
 }

tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/resource/TxcSqlExecutorImpl.java

@@ -2,6 +2,7 @@
 
 import com.codingapi.tx.client.spi.transaction.txc.resource.def.TxcSqlExecutor;
 import com.codingapi.tx.client.spi.transaction.txc.resource.def.bean.*;
+import com.codingapi.tx.client.spi.transaction.txc.resource.init.TxcExceptionConnectionPool;
 import com.codingapi.tx.client.spi.transaction.txc.resource.init.TxcSettingFactory;
 import com.codingapi.tx.client.spi.transaction.txc.resource.rs.UpdateSqlPreDataHandler;
 import com.codingapi.tx.client.spi.transaction.txc.resource.util.SqlUtils;
@@ -36,6 +37,9 @@ public class TxcSqlExecutorImpl implements TxcSqlExecutor {
 
     private final TxLogger txLogger;
 
+    @Autowired
+    private TxcExceptionConnectionPool txcExceptionConnectionPool;
+
     @Autowired
     public TxcSqlExecutorImpl(QueryRunner queryRunner, TxcSettingFactory txcSettingFactory, TxLogger txLogger) {
         this.queryRunner = queryRunner;
@@ -179,6 +183,25 @@ public void applyUndoLog(String groupId, String unitId) throws SQLException {
         }
     }
 
+    @Override
+    public void undoRollbackInfoSql(RollbackInfo rollbackInfo) throws SQLException {
+        Connection connection = txcExceptionConnectionPool.getConnection();
+        try {
+            connection.setAutoCommit(false);
+            for (StatementInfo statementInfo : rollbackInfo.getRollbackSqlList()) {
+                log.debug("txc > Apply undo log. sql: {}, params: {}", statementInfo.getSql(), statementInfo.getParams());
+                queryRunner.update(connection, statementInfo.getSql(), statementInfo.getParams());
+            }
+            connection.commit();
+
+        }finally {
+            try {
+                DbUtils.close(connection);
+            } catch (SQLException ignored) {
+            }
+        }
+    }
+
     @Override
     public void clearUndoLog(String groupId, String unitId) throws SQLException {
         log.debug("txc > clear undo log. groupId: {}, unitId: {}", groupId, unitId);