optimize: use retry logic to end global trx (#7283)

Author: xjlgod

changes/en-us/2.x.md

@@ -85,6 +85,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#7242](https://github.com/apache/incubator-seata/pull/7242)] optimize ratelimit bucketTokenNumPerSecond config
 - [[#7232](https://github.com/apache/incubator-seata/pull/7232)] add license header
 - [[#7260](https://github.com/apache/incubator-seata/pull/7260)] upgrade npmjs dependencies
+- [[#7283](https://github.com/apache/incubator-seata/pull/7283)] optimize: use retry logic to end global trx
 - [[#7284](https://github.com/apache/incubator-seata/pull/7284)] add dependency-check profile
 
 

changes/zh-cn/2.x.md

@@ -83,8 +83,10 @@
 - [[#7250](https://github.com/apache/incubator-seata/pull/7250)] 适配 client_protocol_version > server_protocol_version场景
 - [[#7232](https://github.com/apache/incubator-seata/pull/7232)] 增加 license header
 - [[#7260](https://github.com/apache/incubator-seata/pull/7260)] 升级 npmjs 依赖版本
+- [[#7283](https://github.com/apache/incubator-seata/pull/7283)] 使用重试逻辑优化事务的结束
 - [[#7284](https://github.com/apache/incubator-seata/pull/7284)] 增加 dependency-check profile
 
+
 ### security:
 - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] 升级Guava依赖版本，修复安全漏洞
 - [[#6144](https://github.com/apache/incubator-seata/pull/6144)] 升级Nacos依赖版本至1.4.6

server/src/main/java/org/apache/seata/server/console/impl/AbstractGlobalService.java

@@ -20,10 +20,8 @@
 import org.apache.seata.core.model.GlobalStatus;
 import org.apache.seata.server.console.exception.ConsoleException;
 import org.apache.seata.server.console.service.GlobalSessionService;
-import org.apache.seata.server.coordinator.DefaultCoordinator;
 import org.apache.seata.server.session.BranchSession;
 import org.apache.seata.server.session.GlobalSession;
-import org.apache.seata.server.session.SessionHolder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -121,21 +119,10 @@ public SingleResult<Void> sendCommitOrRollback(String xid) {
             boolean res;
             if (RETRY_COMMIT_STATUS.contains(globalStatus) || GlobalStatus.Committing.equals(globalStatus)
                     || GlobalStatus.StopCommitOrCommitRetry.equals(globalStatus)) {
-                res = DefaultCoordinator.getInstance().doGlobalCommit(globalSession, false);
-                if (res && globalSession.hasBranch() && globalSession.hasATBranch()) {
-                    globalSession.clean();
-                    globalSession.asyncCommit();
-                } else if (res && SessionHolder.findGlobalSession(xid) != null) {
-                    globalSession.end();
-                }
+                res = doRetryCommitGlobal(globalSession);
             } else if (RETRY_ROLLBACK_STATUS.contains(globalStatus) || GlobalStatus.Rollbacking.equals(globalStatus)
                     || GlobalStatus.StopRollbackOrRollbackRetry.equals(globalStatus)) {
-                res = DefaultCoordinator.getInstance().doGlobalRollback(globalSession, false);
-                // the record is not deleted
-                if (res && SessionHolder.findGlobalSession(xid) != null) {
-                    globalSession.changeGlobalStatus(GlobalStatus.Rollbacked);
-                    globalSession.end();
-                }
+                res = doRetryRollbackGlobal(globalSession);
             } else {
                 throw new IllegalArgumentException("current global transaction status is not support to do");
             }
@@ -152,11 +139,11 @@ public SingleResult<Void> changeGlobalStatus(String xid) {
         GlobalStatus globalStatus = globalSession.getStatus();
         try {
             if (FAIL_COMMIT_STATUS.contains(globalStatus)) {
-                boolean committed = doCommitGlobal(globalSession);
+                boolean committed = doRetryCommitGlobal(globalSession);
                 return committed ? SingleResult.success() : SingleResult.failure("Commit fail, please try again");
             }
             if (FAIL_ROLLBACK_STATUS.contains(globalStatus)) {
-                boolean rollbacked = doRollbackGlobal(globalSession);
+                boolean rollbacked = doRetryRollbackGlobal(globalSession);
                 return rollbacked ? SingleResult.success() : SingleResult.failure("Rollback fail, please try again");
             }
         } catch (Exception e) {

server/src/main/java/org/apache/seata/server/console/impl/AbstractService.java

@@ -147,12 +147,12 @@ protected boolean doForceDeleteBranch(GlobalSession globalSession, BranchSession
         return true;
     }
 
-    protected boolean doCommitGlobal(GlobalSession globalSession) throws TransactionException {
-        return DefaultCoordinator.getInstance().doGlobalCommit(globalSession, false);
+    protected boolean doRetryCommitGlobal(GlobalSession globalSession) throws TransactionException {
+        return DefaultCoordinator.getInstance().doGlobalCommit(globalSession, true);
     }
 
-    protected boolean doRollbackGlobal(GlobalSession globalSession) throws TransactionException {
-        return DefaultCoordinator.getInstance().doGlobalRollback(globalSession, false);
+    protected boolean doRetryRollbackGlobal(GlobalSession globalSession) throws TransactionException {
+        return DefaultCoordinator.getInstance().doGlobalRollback(globalSession, true);
     }
 
     protected static class CheckResult {