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: when the xa branch is rollback, it cannot be executed due to idle state #3367

Merged
merged 16 commits into from
Feb 5, 2021

Conversation

funky-eyes
Copy link
Contributor

@funky-eyes funky-eyes commented Dec 13, 2020

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

fixes #3361
fixes #3256

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@funky-eyes funky-eyes added this to the 1.5.0 milestone Dec 13, 2020
@funky-eyes funky-eyes added the module/rm-datasource rm-datasource module label Dec 13, 2020
@funky-eyes funky-eyes changed the title bugfix: when the xa branch is rolled back, it cannot be executed due to idle state bugfix: when the xa branch is rollback, it cannot be executed due to idle state Dec 13, 2020
@codecov-io
Copy link

codecov-io commented Dec 14, 2020

Codecov Report

Merging #3367 (87bf54a) into develop (95d39e6) will decrease coverage by 0.00%.
The diff coverage is 45.45%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #3367      +/-   ##
=============================================
- Coverage      51.56%   51.56%   -0.01%     
  Complexity      3374     3374              
=============================================
  Files            617      617              
  Lines          20438    20440       +2     
  Branches        2565     2565              
=============================================
  Hits           10539    10539              
  Misses          8839     8839              
- Partials        1060     1062       +2     
Impacted Files Coverage Δ Complexity Δ
...a/io/seata/rm/datasource/xa/ResourceManagerXA.java 15.15% <0.00%> (ø) 4.00 <0.00> (ø)
...a/io/seata/rm/datasource/xa/ConnectionProxyXA.java 55.00% <50.00%> (+1.93%) 18.00 <0.00> (+1.00)
...c/main/java/io/seata/config/FileConfiguration.java 43.10% <0.00%> (-1.15%) 12.00% <0.00%> (ø%)
...o/seata/server/coordinator/DefaultCoordinator.java 53.92% <0.00%> (-0.50%) 28.00% <0.00%> (-1.00%)
...in/java/io/seata/server/session/GlobalSession.java 83.63% <0.00%> (-0.46%) 71.00% <0.00%> (-1.00%)
...in/java/io/seata/rm/datasource/xa/XABranchXid.java 70.27% <0.00%> (+2.70%) 12.00% <0.00%> (+1.00%)

@alex8224
Copy link

问题已经修复,重复多次提交不再出现此问题

@MrLiuFang
Copy link

#3256已修复

@funky-eyes funky-eyes added the type: bug Category issues or prs related to bug. label Dec 27, 2020
Copy link
Member

@slievrly slievrly left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@l81893521 l81893521 left a comment

Choose a reason for hiding this comment

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

LGTM

@l81893521 l81893521 merged commit dac15bf into apache:develop Feb 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
module/rm-datasource rm-datasource module type: bug Category issues or prs related to bug.
Projects
None yet
6 participants