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 mixed use of AT and TCC, AT branchs is not deleted #3296

Merged
merged 6 commits into from
Nov 24, 2020

Conversation

wangliang181230
Copy link
Contributor

@wangliang181230 wangliang181230 commented Nov 23, 2020

Ⅰ. Describe what this PR did

bugfix: when mixed use of AT and TCC, AT branchs is not deleted.
问题修复:AT和TCC混合使用时,AT分支未被及时删除。

顺便优化一下:

顺便添加上一个PR中变更过配置位置的提示,效果如下图:
图片

Ⅱ. Does this pull request fix one issue?

fixes #3295

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

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@codecov-io
Copy link

codecov-io commented Nov 23, 2020

Codecov Report

Merging #3296 (8fcd659) into develop (15f0d6e) will decrease coverage by 0.11%.
The diff coverage is 0.00%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #3296      +/-   ##
=============================================
- Coverage      51.12%   51.00%   -0.12%     
- Complexity      3295     3297       +2     
=============================================
  Files            614      614              
  Lines          20125    20099      -26     
  Branches        2514     2467      -47     
=============================================
- Hits           10288    10251      -37     
+ Misses          8805     8796       -9     
- Partials        1032     1052      +20     
Impacted Files Coverage Δ Complexity Δ
.../java/io/seata/server/coordinator/DefaultCore.java 47.56% <0.00%> (-1.83%) 24.00 <0.00> (+1.00) ⬇️
...obuf/convertor/BranchRegisterRequestConvertor.java 90.47% <0.00%> (-9.53%) 3.00% <0.00%> (ø%)
...otobuf/convertor/BranchReportRequestConvertor.java 90.90% <0.00%> (-9.10%) 3.00% <0.00%> (ø%)
...obuf/convertor/BranchRollbackRequestConvertor.java 92.00% <0.00%> (-8.00%) 3.00% <0.00%> (ø%)
...otobuf/convertor/GlobalBeginResponseConvertor.java 92.59% <0.00%> (-7.41%) 3.00% <0.00%> (ø%)
...otobuf/convertor/GlobalCommitRequestConvertor.java 93.75% <0.00%> (-6.25%) 3.00% <0.00%> (ø%)
...otobuf/convertor/GlobalStatusRequestConvertor.java 93.75% <0.00%> (-6.25%) 3.00% <0.00%> (ø%)
...obuf/convertor/GlobalRollbackRequestConvertor.java 93.75% <0.00%> (-6.25%) 3.00% <0.00%> (ø%)
...protobuf/convertor/RegisterTMRequestConvertor.java 94.73% <0.00%> (-5.27%) 3.00% <0.00%> (ø%)
...protobuf/convertor/RegisterRMRequestConvertor.java 90.47% <0.00%> (-4.77%) 3.00% <0.00%> (ø%)
... and 27 more

Copy link
Contributor

@caohdgege caohdgege left a comment

Choose a reason for hiding this comment

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

LGMT

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

Copy link
Member

@jsbxyyx jsbxyyx left a comment

Choose a reason for hiding this comment

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

LGTM

@jsbxyyx jsbxyyx merged commit 23a407e into apache:develop Nov 24, 2020
@wangliang181230 wangliang181230 deleted the bugfix-TC-async-commit branch November 24, 2020 05:00
LiWenGu pushed a commit to LiWenGu/seata that referenced this pull request Dec 4, 2020
@slievrly slievrly added this to the 1.5.0 milestone Dec 8, 2020
@wangliang181230 wangliang181230 modified the milestones: 1.5.0, 1.4.1 Dec 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants