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

apache · May 22, 2024 · 2c4bf6f · 2c4bf6f
1 parent 682b830
commit 2c4bf6f
Showing 1 changed file with 13 additions and 11 deletions.
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 {