Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix: remove RollbackRetryTimeout sessions during in file storage recover #5311

Merged
merged 1 commit into from
Feb 7, 2023
Merged

bugfix: remove RollbackRetryTimeout sessions during in file storage recover #5311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/en-us/develop.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions changes/zh-cn/develop.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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问题
Expand Down
3 changes: 1 addition & 2 deletions rm-datasource/src/main/java/io/seata/rm/datasource/exec/UpdateExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/MySQLUndoUpdateExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ";

Expand Down
1 change: 1 addition & 0 deletions server/src/main/java/io/seata/server/storage/file/session/FileSessionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ private boolean checkSessionStatus(GlobalSession globalSession) {
case RollbackFailed:
case TimeoutRollbacked:
case TimeoutRollbackFailed:
case RollbackRetryTimeout:
case Finished:
return false;
default:
Expand Down