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.

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

bugfix: don't remove GlobalSession when retry rollback or retry commit timeout #5298

Merged
merged 6 commits into from Feb 6, 2023

Conversation

ZhangShiYeChina
Copy link
Contributor

@ZhangShiYeChina ZhangShiYeChina commented Feb 3, 2023

Ⅰ. Describe what this PR did

  1. Correct the comment on MySQLUndoUpdateExecutor#UPDATE_SQL_TEMPLATE (MySQLUndoUpdateExecutor中UPDATE_SQL_TEMPLATE的注释不正确 #5297)
  2. 事务回滚重试超时后,DB会话存储的模式下会将全局事务删除掉,接下来还有修改事务状态的逻辑 #5295

Ⅱ. Does this pull request fix one issue?

fixes #5297
fixes #5295

1. Correct the comment on MySQLUndoUpdateExecutor#UPDATE_SQL_TEMPLATE (apache#5297)
2. Do not remove GlobalSession when retry rollback or retry commit timeout (apache#5293)
@ZhangShiYeChina ZhangShiYeChina changed the title bugfix: bugfix:1. Correct the comment on MySQLUndoUpdateExecutor#UPDATE_SQL_TEMPLATE (#5297) 2. Do not remove GlobalSession when retry rollback or retry commit timeout (#5293) Feb 3, 2023
@ZhangShiYeChina ZhangShiYeChina changed the title bugfix:1. Correct the comment on MySQLUndoUpdateExecutor#UPDATE_SQL_TEMPLATE (#5297) 2. Do not remove GlobalSession when retry rollback or retry commit timeout (#5293) bugfix: Do not remove GlobalSession when retry rollback or retry commit timeout (#5293) Feb 3, 2023
@ZhangShiYeChina ZhangShiYeChina changed the title bugfix: Do not remove GlobalSession when retry rollback or retry commit timeout (#5293) bugfix: Do not remove GlobalSession when retry rollback or retry commit timeout Feb 3, 2023
@codecov-commenter
Copy link

codecov-commenter commented Feb 4, 2023

Codecov Report

Merging #5298 (611a44c) into 2.x (0112719) will increase coverage by 0.00%.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Impacted file tree graph

@@            Coverage Diff            @@
##                2.x    #5298   +/-   ##
=========================================
  Coverage     48.51%   48.51%           
- Complexity     4187     4190    +3     
=========================================
  Files           764      764           
  Lines         26880    26876    -4     
  Branches       3357     3357           
=========================================
- Hits          13040    13039    -1     
+ Misses        12451    12450    -1     
+ Partials       1389     1387    -2     
Impacted Files Coverage Δ
...datasource/undo/mysql/MySQLUndoUpdateExecutor.java 87.50% <ø> (ø)
...o/seata/server/coordinator/DefaultCoordinator.java 44.81% <ø> (-0.09%) ⬇️
...o/seata/server/session/AbstractSessionManager.java 62.31% <0.00%> (-2.90%) ⬇️
.../java/io/seata/server/coordinator/DefaultCore.java 47.59% <0.00%> (-2.41%) ⬇️
...er/src/main/java/io/seata/server/ServerRunner.java 65.38% <0.00%> (+15.38%) ⬆️
.../listener/SystemPropertyLoggerContextListener.java 66.66% <0.00%> (+19.99%) ⬆️

Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -379,9 +379,6 @@ protected void handleRetryRollbacking() {
if (ROLLBACK_RETRY_TIMEOUT_UNLOCK_ENABLE) {
rollbackingSession.clean();
}
// Prevent thread safety issues
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this pr fix TimeoutRollbacking ->TimeoutRollbackRetrying? I didn't get it.

@funky-eyes funky-eyes added this to the 2.0.0 milestone Feb 4, 2023
@slievrly slievrly changed the title bugfix: Do not remove GlobalSession when retry rollback or retry commit timeout bugfix: don't remove GlobalSession when retry rollback or retry commit timeout Feb 6, 2023
@slievrly slievrly merged commit 5eb7c18 into apache:2.x Feb 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants