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: fix branchType not cleaned when consumer is in TCC mode #2914

Merged
merged 7 commits into from
Jul 23, 2020
Merged

bugfix: fix branchType not cleaned when consumer is in TCC mode #2914

merged 7 commits into from
Jul 23, 2020

Conversation

wangliang181230
Copy link
Contributor

@wangliang181230 wangliang181230 commented Jul 21, 2020 •
edited

Ⅰ. Describe what this PR did

bugfix: fix branchType not cleaned when consumer is in TCC mode.

added some test.

Ⅱ. Does this pull request fix one issue?

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

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@codecov-commenter
Copy link

codecov-commenter commented Jul 21, 2020 •
edited

Codecov Report

Merging #2914 into develop will decrease coverage by 0.11%.
The diff coverage is 100.00%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #2914      +/-   ##
=============================================
- Coverage      50.24%   50.13%   -0.12%     
- Complexity      3030     3045      +15     
=============================================
  Files            597      599       +2     
  Lines          19328    19409      +81     
  Branches        2353     2350       -3     
=============================================
+ Hits            9711     9730      +19     
- Misses          8652     8677      +25     
- Partials         965     1002      +37
Impacted Files Coverage Δ Complexity Δ
...baba/AlibabaDubboTransactionPropagationFilter.java 52.38% <100.00%> (ø) 8.00 <0.00> (?)
...dubbo/ApacheDubboTransactionPropagationFilter.java 55.00% <100.00%> (ø) 8.00 <0.00> (?)
...obuf/convertor/BranchRegisterRequestConvertor.java 90.47% <0.00%> (-9.53%) 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%> (ø%)
...otobuf/convertor/BranchReportRequestConvertor.java 95.45% <0.00%> (-4.55%) 3.00% <0.00%> (ø%)
... and 19 more

funky-eyes
funky-eyes approved these changes Jul 22, 2020
View reviewed changes
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

@wangliang181230 wangliang181230 changed the title bugfix: fix branchType must be null after RootContext.unbind() bugfix: fix branchType not cleaned when consumer is in TCC mode Jul 22, 2020
slievrly
slievrly approved these changes Jul 22, 2020
View reviewed changes
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

@slievrly slievrly added this to the 1.4.0 milestone Jul 22, 2020
@funky-eyes funky-eyes merged commit 7da5370 into apache:develop Jul 23, 2020
@wangliang181230 wangliang181230 deleted the bugfix-branchType-null branch July 23, 2020 01:45
@wangliang181230 wangliang181230 added mode: TCC TCC transaction mode type: bug Category issues or prs related to bug. labels Oct 19, 2020
l81893521 pushed a commit to l81893521/seata that referenced this pull request Oct 22, 2020
@wangliang181230 @l81893521
bugfix: fix branchType not cleaned when consumer is in TCC mode (apac…
67c2af1 
…he#2914)
hicf pushed a commit to hicf/seata that referenced this pull request Nov 15, 2020
@wangliang181230 @hicf
bugfix: fix branchType not cleaned when consumer is in TCC mode (apac…
0b8d57b 
…he#2914)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@booogu booogu booogu left review comments

@slievrly slievrly slievrly approved these changes

@funky-eyes funky-eyes Awaiting requested review from funky-eyes

Assignees
No one assigned
Labels
mode: TCC TCC transaction mode type: bug Category issues or prs related to bug.
Projects
None yet
Milestone
1.4.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@wangliang181230 @codecov-commenter @slievrly @funky-eyes @booogu