1、修改TransactionRecovery，每次循环恢复transaction时，propagationExistBegin事务上下文

2、删除target目录的git

1、修改TransactionRecovery，每次循环恢复transaction时，propagationExistBegin事务上下文
2、删除target目录的git
徐烜
1 parent 8835836f
Showing 12 changed files with 14 additions and 19 deletions
.gitignore
tcc-transaction-api/target/maven-archiver/pom.properties
tcc-transaction-api/target/tcc-transaction-api-1.1.5_comment-sources.jar
tcc-transaction-api/target/tcc-transaction-api-1.1.5_comment.jar
tcc-transaction-core/src/main/java/org/mengyun/tcctransaction/recover/TransactionRecovery.java
tcc-transaction-core/target/classes/org/mengyun/tcctransaction/recover/TransactionRecovery.class
tcc-transaction-core/target/maven-archiver/pom.properties
tcc-transaction-core/target/tcc-transaction-core-1.1.5_comment-sources.jar
tcc-transaction-core/target/tcc-transaction-core-1.1.5_comment.jar
tcc-transaction-spring/target/maven-archiver/pom.properties
tcc-transaction-spring/target/tcc-transaction-spring-1.1.5_comment-sources.jar
tcc-transaction-spring/target/tcc-transaction-spring-1.1.5_comment.jar
@@ -2,7 +2,7 @@
 .project
 .springBeans
 .settings/*
-/target/*
+target/
 node_modules/
 test_junitReport/
 test_coverage/
@@ -12,5 +12,5 @@ test_coverage/
 tmp
 # git忽略空文件夹，按照惯例，空文件夹下放置.gitkeep文件避免文件夹被忽略不上传。
-!.gitkeep
-/target/
+!.gitkeep
+/target/
-#Generated by Maven
-#Thu Jan 02 11:02:11 CST 2020
-version=1.1.5_comment
-groupId=org.mengyun
-artifactId=tcc-transaction-api
@@ -2,7 +2,9 @@ package org.mengyun.tcctransaction.recover;
 import org.mengyun.tcctransaction.Transaction;
 import org.mengyun.tcctransaction.TransactionType;
+import org.mengyun.tcctransaction.api.TransactionContext;
 import org.mengyun.tcctransaction.api.TransactionStatus;
+import org.mengyun.tcctransaction.api.TransactionXid;
 import org.mengyun.tcctransaction.repository.TransactionRepository;
 import org.mengyun.tcctransaction.support.TransactionConfigurator;
 import org.slf4j.Logger;
@@ -76,7 +78,6 @@ public class TransactionRecovery {
      */
     private void recoverErrorTransactions(List<Transaction> transactions) {
-
         for (Transaction transaction : transactions) {
             if (transaction.getRetriedCount() > transactionConfigurator.getRecoverConfig().getMaxRetryCount()) {
@@ -90,6 +91,15 @@ public class TransactionRecovery {
             try {
                 transaction.addRetriedCount(); // 重试次数+1
+                // 传播需要恢复的事务上下文
+                TransactionContext transactionContext = new TransactionContext(
+                        new TransactionXid(
+                                transaction.getXid().getGlobalTransactionId(),
+                                transaction.getXid().getBranchQualifier()),
+                        transaction.getStatus().getId()
+                );
+                transactionConfigurator.getTransactionManager().propagationExistBegin(transactionContext);
+
                 if (transaction.getStatus().equals(TransactionStatus.CONFIRMING)) {
                     // 如果是CONFIRMING(2)状态，则将事务往前执行
                     transaction.changeStatus(TransactionStatus.CONFIRMING);
-#Generated by Maven
-#Thu Jan 02 11:02:36 CST 2020
-version=1.1.5_comment
-groupId=org.mengyun
-artifactId=tcc-transaction-core
-#Generated by Maven
-#Tue Jan 14 10:24:31 CST 2020
-version=1.1.5_comment
-groupId=org.mengyun
-artifactId=tcc-transaction-spring