feature:save context into fence log

apache · May 25, 2023 · 9cc7d4e · 9cc7d4e
1 parent 0d05499
commit 9cc7d4e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/common/src/main/java/io/seata/common/Constants.java b/common/src/main/java/io/seata/common/Constants.java
@@ -204,4 +204,14 @@ public interface Constants {
      * where is the tcc actionContext stored
      */
     String TCC_ACTION_CONTEXT_REPORT_TYPE = "actionContextReportType";
+
+    /**
+     * The constant TCC_PREPARE_STATUS
+     */
+    String TCC_PREPARE_STATUS = "tccPrepareStatus";
+
+    /**
+     * Tcc prepare error
+     */
+    String TCC_PREPARE_STATUS_ERROR = "error";
 }
diff --git a/integration/grpc/pom.xml b/integration/grpc/pom.xml
@@ -76,9 +76,9 @@
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.11.0:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:3.11.0:exe:linux-aarch_64</protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.27.1:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.27.1:exe:linux-aarch_64</pluginArtifact>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/serializer/seata-serializer-protobuf/pom.xml b/serializer/seata-serializer-protobuf/pom.xml
@@ -54,7 +54,7 @@
                 <configuration>
                     <protoSourceRoot>${project.basedir}/src/main/resources/protobuf/io/seata/protocol/transcation/</protoSourceRoot>
                     <protocArtifact>
-                        com.google.protobuf:protoc:3.11.0:exe:${os.detected.classifier}
+                        com.google.protobuf:protoc:3.11.0:exe:linux-aarch_64
                     </protocArtifact>
                 </configuration>
                 <executions>

diff --git a/spring/src/main/java/io/seata/rm/fence/SpringFenceHandler.java b/spring/src/main/java/io/seata/rm/fence/SpringFenceHandler.java
@@ -51,6 +51,7 @@
 import io.seata.integration.tx.api.fence.store.CommonFenceStore;
 import io.seata.integration.tx.api.fence.store.db.CommonFenceStoreDataBaseDAO;
 import io.seata.integration.tx.api.remoting.TwoPhaseResult;
+import io.seata.rm.tcc.api.BusinessActionContextUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.datasource.DataSourceUtils;
@@ -136,9 +137,11 @@ public Object prepareFence(String xid, Long branchId, String actionName, Callbac
                     addToLogCleanQueue(xid, branchId);
                 }
                 status.setRollbackOnly();
+                BusinessActionContextUtil.addContext(Constants.TCC_PREPARE_STATUS, Constants.TCC_PREPARE_STATUS_ERROR);
                 throw new SkipCallbackWrapperException(e);
             } catch (Throwable t) {
                 status.setRollbackOnly();
+                BusinessActionContextUtil.addContext(Constants.TCC_PREPARE_STATUS, Constants.TCC_PREPARE_STATUS_ERROR);
                 throw new SkipCallbackWrapperException(t);
             }
         });

diff --git a/tcc/src/main/java/io/seata/rm/tcc/context/FenceLogContextSearcher.java b/tcc/src/main/java/io/seata/rm/tcc/context/FenceLogContextSearcher.java
@@ -60,7 +60,8 @@ public BusinessActionContext search(BusinessActionContext context) {
 
     @Override
     public boolean isSupport(BusinessActionContext context) {
-        return Boolean.TRUE.equals(context.getActionContext(Constants.USE_COMMON_FENCE));
+        return Boolean.TRUE.equals(context.getActionContext(Constants.USE_COMMON_FENCE))
+                && !Constants.TCC_PREPARE_STATUS_ERROR.equals(context.getActionContext(Constants.TCC_PREPARE_STATUS));
     }
 
     public static DataSource getDataSource() {