bugfix: fix GlobalStatus=9 can't be cleared in DB storage mode (apache#5523)

Author: slievrly

changes/en-us/2.0.0.md

@@ -49,6 +49,7 @@ The version is updated as follows:
 - [[#5478](https://github.com/seata/seata/pull/5478)] fix finished transaction swallows exception when committing
 - [[#5491](https://github.com/seata/seata/pull/5491)] fix method name not print in logs
 - [[#5449](https://github.com/seata/seata/pull/5449)] fix Oracle XA transaction reentrant issues
+- [[#5523](https://github.com/seata/seata/pull/5523)] fix GlobalStatus=9 can't be cleared in DB storage mode
 
 ### optimize：
 - [[#5208](https://github.com/seata/seata/pull/5208)] optimize throwable getCause once more

changes/zh-cn/2.0.0.md

@@ -47,6 +47,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
 - [[#5478](https://github.com/seata/seata/pull/5478)] 修复提交事务时事务已完成不抛出异常问题
 - [[#5491](https://github.com/seata/seata/pull/5491)] 修复日志中不打印方法名的问题
 - [[#5449](https://github.com/seata/seata/pull/5449)] 修复Oracle XA模式 start 重入问题
+- [[#5523](https://github.com/seata/seata/pull/5523)] 修复 GlobalStatus=9 在DB存储模式无法清除的问题
 
 ### optimize：
 - [[#5208](https://github.com/seata/seata/pull/5208)] 优化多次重复获取Throwable#getCause问题

server/src/main/java/io/seata/server/coordinator/DefaultCoordinator.java

@@ -170,8 +170,7 @@ public class DefaultCoordinator extends AbstractTCInboundHandler implements Tran
     private final GlobalStatus[] rollbackingStatuses = new GlobalStatus[] {GlobalStatus.TimeoutRollbacking,
         GlobalStatus.TimeoutRollbackRetrying, GlobalStatus.RollbackRetrying, GlobalStatus.Rollbacking};
 
-    private final GlobalStatus[] retryCommittingStatuses =
-        new GlobalStatus[] {GlobalStatus.Committing, GlobalStatus.CommitRetrying};
+    private final GlobalStatus[] retryCommittingStatuses = new GlobalStatus[] {GlobalStatus.Committing, GlobalStatus.CommitRetrying, GlobalStatus.Committed};
 
     private final ThreadPoolExecutor branchRemoveExecutor;
 
@@ -411,8 +410,7 @@ protected void handleRetryCommitting() {
         SessionHelper.forEach(committingSessions, committingSession -> {
             try {
                 // prevent repeated commit
-                if (committingSession.getStatus() == GlobalStatus.Committing
-                    && !committingSession.isDeadSession()) {
+                if (GlobalStatus.Committing.equals(committingSession.getStatus()) && !committingSession.isDeadSession()) {
                     // The function of this 'return' is 'continue'.
                     return;
                 }
@@ -424,6 +422,10 @@ protected void handleRetryCommitting() {
                     //The function of this 'return' is 'continue'.
                     return;
                 }
+                if (GlobalStatus.Committed.equals(committingSession.getStatus())
+                    && committingSession.getBranchSessions().isEmpty()) {
+                    SessionHelper.endCommitted(committingSession,true);
+                }
                 core.doGlobalCommit(committingSession, true);
             } catch (TransactionException ex) {
                 LOGGER.error("Failed to retry committing [{}] {} {}", committingSession.getXid(), ex.getCode(), ex.getMessage());

server/src/main/java/io/seata/server/session/GlobalSession.java

@@ -246,6 +246,7 @@ public void close() throws TransactionException {
     @Override
     public void end() throws TransactionException {
         if (GlobalStatus.isTwoPhaseSuccess(status)) {
+            // TODO: Non AT mode does not need to be unlocked
             // Clean locks first
             clean();
             SessionHolder.getRootSessionManager().onSuccessEnd(this);

server/src/main/java/io/seata/server/session/SessionHelper.java

@@ -132,6 +132,7 @@ public static void endCommitted(GlobalSession globalSession, boolean retryGlobal
         if (retryGlobal || !DELAY_HANDLE_SESSION) {
             long beginTime = System.currentTimeMillis();
             boolean retryBranch = globalSession.getStatus() == GlobalStatus.CommitRetrying;
+            // TODO: If the globalSession status in the database is Committed, don't set status again
             globalSession.changeGlobalStatus(GlobalStatus.Committed);
             globalSession.end();
             if (!DELAY_HANDLE_SESSION) {