tx:txc upgrade

ujued · ujued · commit 260ea0a7c916 · 2019-01-14T14:25:18.000+08:00
diff --git a/tx-client/src/main/java/com/codingapi/tx/client/aspect/weave/DTXLogicWeaver.java b/tx-client/src/main/java/com/codingapi/tx/client/aspect/weave/DTXLogicWeaver.java
@@ -69,7 +69,7 @@ public Object runTransaction(DTXInfo dtxInfo, BusinessCallback business) throws
             return transactionServiceExecutor.transactionRunning(info);
         } finally {
             synchronized (DTXLocal.cur()) {
-                DTXLocal.cur().notify();
+                DTXLocal.cur().notifyAll();
             }
             DTXLocal.makeNeverAppeared();
             log.info("tx-unit end------>");
diff --git a/tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/lcn/control/LcnTransactionCleanService.java b/tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/lcn/control/LcnTransactionCleanService.java
@@ -1,4 +1,4 @@
-package com.codingapi.tx.client.spi.message.lcn;
+package com.codingapi.tx.client.spi.transaction.lcn.control;
 
 import com.codingapi.tx.client.spi.transaction.lcn.resource.LCNConnectionProxy;
 import com.codingapi.tx.commons.exception.TransactionClearException;
diff --git a/tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/tcc/control/TccTransactionCleanService.java b/tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/tcc/control/TccTransactionCleanService.java
@@ -1,4 +1,4 @@
-package com.codingapi.tx.client.spi.message.tcc;
+package com.codingapi.tx.client.spi.transaction.tcc.control;
 
 import com.codingapi.tx.client.bean.DTXLocal;
 import com.codingapi.tx.client.spi.transaction.tcc.control.UnitTCCInfoMap;
diff --git a/tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/control/TxcRunningTransaction.java b/tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/control/TxcRunningTransaction.java
@@ -78,15 +78,7 @@ public void onBusinessCodeSuccess(TxTransactionInfo info, Object result) throws
             txcService.writeUndoLog(
                     info.getGroupId(), info.getUnitId(), (RollbackInfo) DTXLocal.cur().getAttachment());
         } catch (TxcLogicException 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.");
+            throw new TxClientException("txc write undo log fail.");
         }
         // 加入事务组
         transactionControlTemplate.joinGroup(info.getGroupId(), info.getUnitId(), info.getTransactionType(),
diff --git a/tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/control/TxcTransactionCleanService.java b/tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/control/TxcTransactionCleanService.java
@@ -1,15 +1,16 @@
-package com.codingapi.tx.client.spi.message.txc;
+package com.codingapi.tx.client.spi.transaction.txc.control;
 
+import com.codingapi.tx.client.bean.DTXLocal;
 import com.codingapi.tx.client.spi.transaction.txc.resource.def.TxcService;
-import com.codingapi.tx.commons.exception.TransactionClearException;
+import com.codingapi.tx.client.spi.transaction.txc.resource.def.bean.RollbackInfo;
 import com.codingapi.tx.client.support.common.TransactionCleanService;
+import com.codingapi.tx.commons.exception.TransactionClearException;
 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;
 
-import java.sql.SQLException;
+import java.util.Objects;
 
 /**
  * Description:
@@ -31,9 +32,18 @@ public TxcTransactionCleanService(TxcService txcService) {
     @Override
     public void clear(String groupId, int state, String unitId, String unitType) throws TransactionClearException {
         try {
-            // 若需要回滚读undo_log，进行回滚
-            if (state != 1 && state != -1) {
-                txcService.undo(groupId, unitId);
+            try {
+                // 若需要回滚读undo_log，进行回滚
+                if (state != 1 && state != -1) {
+                    txcService.undo(groupId, unitId);
+                }
+            } catch (Exception e) {
+                if (Objects.nonNull(DTXLocal.cur())) {
+                    RollbackInfo rollbackInfo = (RollbackInfo) DTXLocal.cur().getAttachment();
+                    if (Objects.nonNull(rollbackInfo)) {
+                        txcService.undoByRollbackInfo(rollbackInfo);
+                    }
+                }
             }
 
             // 清理TXC
diff --git a/tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/resource/TxcServiceImpl.java b/tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/resource/TxcServiceImpl.java
@@ -227,7 +227,7 @@ public void undo(String groupId, String unitId) throws TxcLogicException {
     }
 
     @Override
-    public void undoRollbackInfo(RollbackInfo rollbackInfo) throws TxcLogicException {
+    public void undoByRollbackInfo(RollbackInfo rollbackInfo) throws TxcLogicException {
         try {
             txcSqlExecutor.undoRollbackInfoSql(rollbackInfo);
         } catch (SQLException e) {
diff --git a/tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/resource/def/TxcService.java b/tx-client/src/main/java/com/codingapi/tx/client/spi/transaction/txc/resource/def/TxcService.java
@@ -81,5 +81,5 @@ public interface TxcService {
      *
      * @throws TxcLogicException
      */
-    void undoRollbackInfo(RollbackInfo rollbackInfo) throws TxcLogicException;
+    void undoByRollbackInfo(RollbackInfo rollbackInfo) throws TxcLogicException;
 }
diff --git a/tx-client/src/main/java/com/codingapi/tx/client/support/checking/SimpleDTXChecking.java b/tx-client/src/main/java/com/codingapi/tx/client/support/checking/SimpleDTXChecking.java
@@ -1,6 +1,7 @@
 package com.codingapi.tx.client.support.checking;
 
 import com.codingapi.tx.client.aspectlog.AspectLogger;
+import com.codingapi.tx.client.bean.DTXLocal;
 import com.codingapi.tx.client.config.TxClientConfig;
 import com.codingapi.tx.client.spi.message.RpcClient;
 import com.codingapi.tx.client.spi.message.dto.MessageDto;
@@ -80,6 +81,13 @@ public void startDelayCheckingAsync(String groupId, String unitId, String transa
         txLogger.trace(groupId, unitId, Transactions.TAG_TASK, "start delay checking task");
         ScheduledFuture scheduledFuture = scheduledExecutorService.schedule(() -> {
             try {
+                if (Objects.nonNull(DTXLocal.cur())) {
+                    synchronized (DTXLocal.cur()) {
+                        txLogger.trace(groupId, unitId, Transactions.TAG_TASK,
+                                "checking waiting for business code finish.");
+                        DTXLocal.cur().wait();
+                    }
+                }
                 String channel = rpcClient.loadRemoteKey();
                 MessageDto messageDto = rpcClient.request(channel, MessageCreator.askTransactionState(groupId, unitId));
                 int state = SerializerContext.getInstance().deSerialize(messageDto.getBytes(), Short.class);
@@ -95,7 +103,7 @@ public void startDelayCheckingAsync(String groupId, String unitId, String transa
 
             } catch (RpcException e) {
                 onAskTransactionStateException(groupId, unitId, transactionType);
-            } catch (TransactionClearException | SerializerException e) {
+            } catch (TransactionClearException | SerializerException | InterruptedException e) {
                 log.error("{} > [transaction state message] error or [clean transaction] error.", transactionType);
             }
         }, clientConfig.getDtxTime(), TimeUnit.MILLISECONDS);
diff --git a/tx-client/src/main/java/com/codingapi/tx/client/support/common/DefaultNotifiedUnitService.java b/tx-client/src/main/java/com/codingapi/tx/client/support/common/DefaultNotifiedUnitService.java
@@ -8,6 +8,9 @@
 import com.codingapi.tx.commons.exception.TransactionClearException;
 import com.codingapi.tx.commons.exception.TxClientException;
 import com.codingapi.tx.client.spi.message.params.NotifyUnitParams;
+import com.codingapi.tx.commons.util.Transactions;
+import com.codingapi.tx.logger.TxLogger;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Description: 默认RPC命令业务
@@ -19,6 +22,9 @@ public class DefaultNotifiedUnitService implements RpcExecuteService {
 
     private final TransactionCleanTemplate transactionCleanTemplate;
 
+    @Autowired
+    private TxLogger txLogger;
+
 
     public DefaultNotifiedUnitService(TransactionCleanTemplate transactionCleanTemplate) {
         this.transactionCleanTemplate = transactionCleanTemplate;
@@ -27,12 +33,14 @@ public DefaultNotifiedUnitService(TransactionCleanTemplate transactionCleanTempl
     @Override
     public Object execute(TransactionCmd transactionCmd) throws TxClientException {
         try {
+            NotifyUnitParams notifyUnitParams = transactionCmd.getMsg().loadData(NotifyUnitParams.class);
             if (DTXLocal.cur() != null) {
                 synchronized (DTXLocal.cur()) {
+                    txLogger.trace(transactionCmd.getGroupId(), notifyUnitParams.getUnitId(), Transactions.TAG_TRANSACTION,
+                            "clean transaction cmd waiting for business code finish.");
                     DTXLocal.cur().wait();
                 }
             }
-            NotifyUnitParams notifyUnitParams = transactionCmd.getMsg().loadData(NotifyUnitParams.class);
             transactionCleanTemplate.clean(
                     notifyUnitParams.getGroupId(),
                     notifyUnitParams.getUnitId(),
diff --git a/tx-client/src/main/java/com/codingapi/tx/client/support/separate/TXLCNTransactionServiceExecutor.java b/tx-client/src/main/java/com/codingapi/tx/client/support/separate/TXLCNTransactionServiceExecutor.java
@@ -6,6 +6,7 @@
 import com.codingapi.tx.client.support.common.TransactionUnitTypeList;
 import com.codingapi.tx.client.support.common.cache.TransactionAttachmentCache;
 import com.codingapi.tx.commons.exception.BeforeBusinessException;
+import com.codingapi.tx.commons.util.Transactions;
 import com.codingapi.tx.logger.TxLogger;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,22 +65,22 @@ public Object transactionRunning(TxTransactionInfo info) throws Throwable {
 
         try {
             // 5.2 业务执行前
-            txLogger.trace(info.getGroupId(), info.getUnitId(), "transaction", "pre service business code");
+            txLogger.trace(info.getGroupId(), info.getUnitId(), Transactions.TAG_TRANSACTION, "pre service business code");
             lcnTransactionControl.preBusinessCode(info);
             // 5.3 执行业务
-            txLogger.trace(info.getGroupId(), info.getUnitId(), "transaction", "do service business code");
+            txLogger.trace(info.getGroupId(), info.getUnitId(), Transactions.TAG_TRANSACTION, "do service business code");
             Object result = lcnTransactionControl.doBusinessCode(info);
 
             // 5.4 业务执行成功
-            txLogger.trace(info.getGroupId(), info.getUnitId(), "transaction", "service business success");
+            txLogger.trace(info.getGroupId(), info.getUnitId(), Transactions.TAG_TRANSACTION, "service business success");
             lcnTransactionControl.onBusinessCodeSuccess(info, result);
             return result;
         } catch (BeforeBusinessException e) {
             log.error("business", e);
             throw e;
         } catch (Throwable e) {
             // 5.5 业务执行失败
-            txLogger.trace(info.getGroupId(), info.getUnitId(), "transaction", "business code error");
+            txLogger.trace(info.getGroupId(), info.getUnitId(), Transactions.TAG_TRANSACTION, "business code error");
             lcnTransactionControl.onBusinessCodeError(info, e);
             throw e;
         } finally {

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public Object runTransaction(DTXInfo dtxInfo, BusinessCallback business) throws`
`69`	`69`	`return transactionServiceExecutor.transactionRunning(info);`
`70`	`70`	`} finally {`
`71`	`71`	`synchronized (DTXLocal.cur()) {`
`72`		`- DTXLocal.cur().notify();`
	`72`	`+ DTXLocal.cur().notifyAll();`
`73`	`73`	`}`
`74`	`74`	`DTXLocal.makeNeverAppeared();`
`75`	`75`	`log.info("tx-unit end------>");`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.codingapi.tx.client.spi.message.lcn;`
	`1`	`+package com.codingapi.tx.client.spi.transaction.lcn.control;`
`2`	`2`
`3`	`3`	`import com.codingapi.tx.client.spi.transaction.lcn.resource.LCNConnectionProxy;`
`4`	`4`	`import com.codingapi.tx.commons.exception.TransactionClearException;`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public void undo(String groupId, String unitId) throws TxcLogicException {`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`@Override`
`230`		`- public void undoRollbackInfo(RollbackInfo rollbackInfo) throws TxcLogicException {`
	`230`	`+ public void undoByRollbackInfo(RollbackInfo rollbackInfo) throws TxcLogicException {`
`231`	`231`	`try {`
`232`	`232`	`txcSqlExecutor.undoRollbackInfoSql(rollbackInfo);`
`233`	`233`	`} catch (SQLException e) {`
Original file line number	Diff line number	Diff line change
`@@ -81,5 +81,5 @@ public interface TxcService {`
`81`	`81`	`*`
`82`	`82`	`* @throws TxcLogicException`
`83`	`83`	`*/`
`84`		`- void undoRollbackInfo(RollbackInfo rollbackInfo) throws TxcLogicException;`
	`84`	`+ void undoByRollbackInfo(RollbackInfo rollbackInfo) throws TxcLogicException;`
`85`	`85`	`}`