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: failure to compete for a lock causes the global transaction to exit #3451

Merged
merged 5 commits into from
Jan 14, 2021

Conversation

litianyu1992
Copy link
Contributor

Ⅰ. Describe what this PR did

bugfix

Ⅱ. Does this pull request fix one issue?

fix #3442

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

Ⅳ. Describe how to verify it

可以下载该代码,https://github.com/ben905713861/seataTest,去除本地事务注解,并发访问测试

Ⅴ. Special notes for reviews

@codecov-io
Copy link

codecov-io commented Jan 8, 2021

Codecov Report

Merging #3451 (bcbb09c) into develop (95d39e6) will decrease coverage by 0.01%.
The diff coverage is 22.22%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #3451      +/-   ##
=============================================
- Coverage      51.56%   51.54%   -0.02%     
+ Complexity      3374     3373       -1     
=============================================
  Files            617      617              
  Lines          20438    20445       +7     
  Branches        2565     2565              
=============================================
  Hits           10539    10539              
- Misses          8839     8845       +6     
- Partials        1060     1061       +1     
Impacted Files Coverage Δ Complexity Δ
...n/java/io/seata/rm/datasource/ConnectionProxy.java 24.64% <0.00%> (-0.54%) 13.00 <0.00> (ø)
...java/io/seata/rm/datasource/ConnectionContext.java 81.44% <25.00%> (-2.43%) 36.00 <0.00> (ø)
...ta/rm/datasource/exec/AbstractDMLBaseExecutor.java 59.61% <100.00%> (ø) 11.00 <0.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%)
...n/src/main/java/io/seata/common/util/IdWorker.java 83.33% <0.00%> (+6.25%) 12.00% <0.00%> (+1.00%)

@litianyu1992 litianyu1992 changed the title Bugfix #3442 Failure to compete for a lock causes the global transaction to exit bugfix:failure to compete for a lock causes the global transaction to exit Jan 8, 2021
@litianyu1992 litianyu1992 changed the title bugfix:failure to compete for a lock causes the global transaction to exit bugfix: failure to compete for a lock causes the global transaction to exit Jan 8, 2021
@funky-eyes funky-eyes added first-time contributor first-time contributor module/rm-datasource rm-datasource module type: bug Category issues or prs related to bug. labels Jan 9, 2021
@funky-eyes funky-eyes added this to the 1.5.0 milestone Jan 9, 2021
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
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.

LGTM

@@ -23,6 +23,7 @@
- [[#3348](https://github.com/seata/seata/pull/3348)] support redis sentinel mode
- [[#2667](https://github.com/seata/seata/pull/2667)] support password decryption
- [[#3427](https://github.com/seata/seata/pull/3427)] add distributed lock interface
- [[#3443](https://github.com/seata/seata/pull/3443)] send the `seata-server` log to `logstash` or `kafka`
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this duplicated?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is this duplicated?

#3443属于feature,但是他填写到了bugfix,所以在我的pr里,帮他做了更正 @l81893521

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

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
first-time contributor first-time contributor module/rm-datasource rm-datasource module type: bug Category issues or prs related to bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

锁竞争失败导致rm退出全局事务
6 participants