bugfix: remove RollbackRetryTimeout sessions during in file storage r…

…ecover (apache#5311) Signed-off-by: slievrly <[email protected]>
l81893521 · Mar 28, 2023 · cf1e4f1 · cf1e4f1
1 parent 743c63e
commit cf1e4f1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
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/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 ";