Apply comment

apache · Feb 15, 2025 · a7a9e52 · a7a9e52
1 parent 932c51f
commit a7a9e52
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/server/src/main/java/org/apache/seata/server/coordinator/DefaultCoordinator.java b/server/src/main/java/org/apache/seata/server/coordinator/DefaultCoordinator.java
@@ -206,8 +206,7 @@ public class DefaultCoordinator extends AbstractTCInboundHandler implements Tran
     private final GlobalStatus[] rollbackingStatuses = new GlobalStatus[] {GlobalStatus.Rollbacking};
     private final GlobalStatus[] committingStatuses = new GlobalStatus[] {GlobalStatus.Committing};
     private final GlobalStatus[] endStatuses = new GlobalStatus[] {GlobalStatus.Rollbacked, GlobalStatus.TimeoutRollbacked,
-        GlobalStatus.CommitFailed, GlobalStatus.RollbackFailed, GlobalStatus.TimeoutRollbackFailed, GlobalStatus.Finished,
-        GlobalStatus.CommitRetryTimeout, GlobalStatus.RollbackRetryTimeout};
+        GlobalStatus.CommitFailed, GlobalStatus.RollbackFailed, GlobalStatus.TimeoutRollbackFailed, GlobalStatus.Finished};
 
     private final ThreadPoolExecutor branchRemoveExecutor;
 
@@ -673,21 +672,25 @@ protected void handleEndStatesByScheduled() {
         SessionHelper.forEach(needDoRollbackedSessions, rollbackedSession -> {
             try {
                 if (isRetryTimeout(now, MAX_ROLLBACK_RETRY_TIMEOUT, rollbackedSession.getBeginTime())) {
-
-                    // commit retry timeout event
-                    SessionHelper.endRollbackFailed(rollbackedSession, true, true);
-
-                    //The function of this 'return' is 'continue'.
-                    return;
+                    handleEndStateSession(rollbackedSession);
                 }
-                core.doGlobalRollback(rollbackedSession, true);
             } catch (TransactionException ex) {
                 LOGGER.error("Failed to handle rollbacked [{}] {} {}", rollbackedSession.getXid(), ex.getCode(), ex.getMessage());
             }
         });
         rollbackedSchedule(delay);
     }
 
+    private void handleEndStateSession(GlobalSession globalSession) throws TransactionException {
+        GlobalStatus status = globalSession.getStatus();
+
+        if (status == GlobalStatus.CommitFailed) {
+            SessionHelper.endCommitted(globalSession, true);
+            return;
+        }
+        SessionHelper.endRollbacked(globalSession, true);
+    }
+
     private void rollbackedSchedule(long delay) {
         syncProcessing.schedule(
             () -> {