bugfix: remove RollbackRetryTimeout sessions during in file storage r…

…ecover (#5311) Signed-off-by: slievrly <[email protected]>
apache · Feb 7, 2023 · eab8c9a · eab8c9a
1 parent 83db274
commit eab8c9a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/changes/en-us/develop.md b/changes/en-us/develop.md
@@ -19,6 +19,7 @@ Add changes here for all PR submitted to the develop branch.
 - [[#5287](https://github.com/seata/seata/pull/5287)] fix auto-increment of pk columns in PostgreSQL in AT mode
 - [[#5299](https://github.com/seata/seata/pull/5299)] fix GlobalSession deletion when retry rollback or retry commit timeout
 - [[#5307](https://github.com/seata/seata/pull/5307)] fix that keywords don't add escaped characters
+- [[#5311](https://github.com/seata/seata/pull/5311)] remove RollbackRetryTimeout sessions during in file storage recover
 
 
 ### optimize:

diff --git a/changes/zh-cn/develop.md b/changes/zh-cn/develop.md
@@ -19,6 +19,7 @@
 - [[#5287](https://github.com/seata/seata/pull/5287)] 修复AT模式下pgsql的主键列自增的问题
 - [[#5299](https://github.com/seata/seata/pull/5299)] 修复TC端重试回滚或重试提交超时GlobalSession的删除问题
 - [[#5307](https://github.com/seata/seata/pull/5307)] 修复生成update前后镜像sql不对关键字转义的bug
+- [[#5311](https://github.com/seata/seata/pull/5311)] 移除基于文件存储恢复时的RollbackRetryTimeout事务
 
 ### optimize:
 - [[#5208](https://github.com/seata/seata/pull/5208)] 优化多次重复获取Throwable#getCause问题

diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/UpdateExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/UpdateExecutor.java
@@ -135,8 +135,7 @@ protected List<String> getNeedUpdateColumns(String table, String tableAlias, Lis
                 }
             }
             needUpdateColumns.addAll(unescapeUpdateColumns.parallelStream()
-                .map(originUpdateColumn -> ColumnUtils.addEscape(originUpdateColumn, getDbType()))
-                .collect(Collectors.toList()));
+                .map(unescapeUpdateColumn -> ColumnUtils.addEscape(unescapeUpdateColumn, getDbType())).collect(Collectors.toList()));
 
             // The on update xxx columns will be auto update by db, so it's also the actually updated columns
             List<String> onUpdateColumns = tableMeta.getOnUpdateColumnsOnlyName();

diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/MySQLUndoUpdateExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/MySQLUndoUpdateExecutor.java
@@ -37,7 +37,7 @@
 public class MySQLUndoUpdateExecutor extends AbstractUndoExecutor {
 
     /**
-     * UPDATE a SET x = ?, y = ?, z = ? WHERE pk1 =? and pk2 =?
+     * UPDATE a SET x = ?, y = ?, z = ? WHERE pk1 = ? and pk2 = ?
      */
     private static final String UPDATE_SQL_TEMPLATE = "UPDATE %s SET %s WHERE %s ";
 

diff --git a/server/src/main/java/io/seata/server/storage/file/session/FileSessionManager.java b/server/src/main/java/io/seata/server/storage/file/session/FileSessionManager.java
@@ -232,6 +232,7 @@ private boolean checkSessionStatus(GlobalSession globalSession) {
             case RollbackFailed:
             case TimeoutRollbacked:
             case TimeoutRollbackFailed:
+            case RollbackRetryTimeout:
             case Finished:
                 return false;
             default: