bugfix: fix when doing global rollback ,may cause an endless loop

apache · May 22, 2024 · 4f078f2 · 4f078f2
1 parent 682b830
commit 4f078f2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -42,6 +42,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6554](https://github.com/apache/incubator-seata/pull/6554)] fix unfixed serializer
 - [[#6555](https://github.com/apache/incubator-seata/pull/6555)] businessActionContext is compatible with io seata
 - [[#6553](https://github.com/apache/incubator-seata/pull/6553)] fix saga "cannot matching status"
+- [[#6569](https://github.com/apache/incubator-seata/pull/6569)] fix when doing global rollback ,may cause an endless loop
 
 
 ### optimize:
@@ -208,5 +209,6 @@ Thanks to these contributors for their code commits. Please report an unintended
 - [TakeActionNow2019](https://github.com/TakeActionNow2019)
 - [sunxunle](https://github.com/sunxunle)
 - [bageyang](https://github.com/bageyang)
+- [sixl](https://github.com/sixlei)
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -42,6 +42,7 @@
 - [[#6554](https://github.com/apache/incubator-seata/pull/6554)] 修复序列化器不固定使用对应配置序列化器的问题
 - [[#6555](https://github.com/apache/incubator-seata/pull/6555)] 修复businessActionContext对io seata包的不兼容
 - [[#6553](https://github.com/apache/incubator-seata/pull/6553)] 修复执行完 'ServiceTask' 后无法应用任何评估器的问题
+- [[#6569](https://github.com/apache/incubator-seata/pull/6569)] 修复做全局回滚时，可能造成死循环的问题
 
 ### optimize:
 - [[#6031](https://github.com/apache/incubator-seata/pull/6031)] 添加undo_log表的存在性校验
@@ -204,5 +205,6 @@
 - [TakeActionNow2019](https://github.com/TakeActionNow2019)
 - [sunxunle](https://github.com/sunxunle)
 - [bageyang](https://github.com/bageyang)
+- [sixl](https://github.com/sixlei)
 
 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
diff --git a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/AbstractUndoLogManager.java b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/AbstractUndoLogManager.java
@@ -339,20 +339,22 @@ public void undo(DataSourceProxy dataSourceProxy, String xid, long branchId) thr
                             State.GlobalFinished.name());
                     }
                 } else {
-                    insertUndoLogWithGlobalFinished(xid, branchId, UndoLogParserFactory.getInstance(), conn);
-                    conn.commit();
-                    if (LOGGER.isInfoEnabled()) {
-                        LOGGER.info("xid {} branch {}, undo_log added with {}", xid, branchId,
-                            State.GlobalFinished.name());
+                    try {
+                        insertUndoLogWithGlobalFinished(xid, branchId, UndoLogParserFactory.getInstance(), conn);
+                        conn.commit();
+                        if (LOGGER.isInfoEnabled()) {
+                            LOGGER.info("xid {} branch {}, undo_log added with {}", xid, branchId,
+                                    State.GlobalFinished.name());
+                        }
+                    } catch (SQLIntegrityConstraintViolationException e) {
+                        // Possible undo_log has been inserted into the database by other processes, retrying rollback undo_log
+                        if (LOGGER.isInfoEnabled()) {
+                            LOGGER.info("xid {} branch {}, undo_log inserted, retry rollback", xid, branchId);
+                        }
+                        continue;
                     }
                 }
-
                 return;
-            } catch (SQLIntegrityConstraintViolationException e) {
-                // Possible undo_log has been inserted into the database by other processes, retrying rollback undo_log
-                if (LOGGER.isInfoEnabled()) {
-                    LOGGER.info("xid {} branch {}, undo_log inserted, retry rollback", xid, branchId);
-                }
             } catch (Throwable e) {
                 if (conn != null) {
                     try {