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: fix global lock not released when rollback retry timeout #2198

Merged
merged 4 commits into from
Jan 19, 2020

Conversation

zjinlei
Copy link
Contributor

@zjinlei zjinlei commented Jan 17, 2020

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

fixes #2166

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

Ⅳ. Describe how to verify it

DefaultCoordinatorTest.test_handleRetryRollbackingTimeOut
DefaultCoordinatorTest.test_handleRetryRollbackingTimeOut_unlock

Ⅴ. Special notes for reviews

@codecov-io
Copy link

codecov-io commented Jan 17, 2020

Codecov Report

Merging #2198 into develop will decrease coverage by 0.17%.
The diff coverage is 35.25%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #2198      +/-   ##
=============================================
- Coverage      54.44%   54.27%   -0.18%     
- Complexity      2473     2494      +21     
=============================================
  Files            447      453       +6     
  Lines          14759    14898     +139     
  Branches        1735     1756      +21     
=============================================
+ Hits            8036     8086      +50     
- Misses          5963     6041      +78     
- Partials         760      771      +11
Impacted Files Coverage Δ Complexity Δ
...in/java/io/seata/integration/http/XidResource.java 0% <0%> (ø) 0 <0> (?)
...integration/http/HttpHandlerExceptionResolver.java 0% <0%> (ø) 0 <0> (?)
...ration/http/TransactionPropagationIntercepter.java 0% <0%> (ø) 0 <0> (?)
.../seata/integration/http/HttpAutoConfiguration.java 0% <0%> (ø) 0 <0> (?)
...o/seata/integration/http/AbstractHttpExecutor.java 53.7% <53.7%> (ø) 10 <10> (?)
...io/seata/integration/http/DefaultHttpExecutor.java 57.14% <57.14%> (ø) 8 <8> (?)
...very/registry/zk/ZookeeperRegisterServiceImpl.java 62.9% <0%> (-0.81%) 24% <0%> (ø)
... and 5 more

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, good test cases.

Copy link
Member

@xingfudeshi xingfudeshi 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 merged commit 634777b into apache:develop Jan 19, 2020
@zjinlei zjinlei deleted the bugfix/2166/releaselockswitch branch January 20, 2020 13:44
@slievrly slievrly added this to the 1.1.0 milestone Feb 3, 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
Development

Successfully merging this pull request may close these issues.

When GlobalTransaction retry timeout. the global lock not released.
4 participants