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

optimize: add get local global status #2351

Merged
merged 6 commits into from Mar 10, 2020

Conversation

funky-eyes
Copy link
Contributor

@funky-eyes funky-eyes commented Mar 4, 2020

Ⅰ. Describe what this PR did

add get local global status

Ⅱ. Does this pull request fix one issue?

#2325

@codecov-io
Copy link

codecov-io commented Mar 4, 2020

Codecov Report

Merging #2351 into develop will increase coverage by 0.01%.
The diff coverage is 66.66%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #2351      +/-   ##
=============================================
+ Coverage      51.75%   51.77%   +0.01%     
- Complexity      2695     2696       +1     
=============================================
  Files            517      517              
  Lines          16760    16760              
  Branches        2034     2034              
=============================================
+ Hits            8674     8677       +3     
+ Misses          7275     7273       -2     
+ Partials         811      810       -1
Impacted Files Coverage Δ Complexity Δ
...java/io/seata/tm/api/DefaultGlobalTransaction.java 74.44% <100%> (+0.28%) 22 <1> (+1) ⬆️
...in/java/io/seata/tm/api/TransactionalTemplate.java 66.66% <50%> (-0.31%) 24 <0> (ø)
...server/store/file/FileTransactionStoreManager.java 57.46% <0%> (+0.95%) 29% <0%> (ø) ⬇️

@funky-eyes funky-eyes changed the title bugfix:add get current global status bugfix:add get local global status Mar 4, 2020
@funky-eyes funky-eyes force-pushed the fix_status_error branch 2 times, most recently from f333252 to c103bf4 Compare March 7, 2020 16:01
@@ -145,8 +145,9 @@ private void rollbackTransaction(GlobalTransaction tx, Throwable ex) throws Tran
triggerAfterRollback();
// 3.1 Successfully rolled back
throw new TransactionalExecutor.ExecutionException(tx,
tx.getStatus().equals(GlobalStatus.RollbackRetrying) ? TransactionalExecutor.Code.RollbackRetrying :
TransactionalExecutor.Code.RollbackDone, ex);
null != tx.getLocalStatus() && tx.getLocalStatus().equals(GlobalStatus.RollbackRetrying)
Copy link
Member

Choose a reason for hiding this comment

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

simplify the conditional judgment

Copy link
Contributor Author

Choose a reason for hiding this comment

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

simplify the conditional judgment

PTAL

@funky-eyes
Copy link
Contributor Author

@zjinlei @slievrly @xingfudeshi PTAL

@funky-eyes funky-eyes requested a review from slievrly March 9, 2020 14:57
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

@zjinlei zjinlei left a comment

Choose a reason for hiding this comment

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

LGTM

@zjinlei zjinlei changed the title bugfix:add get local global status optimize: add get local global status Mar 10, 2020
@zjinlei zjinlei merged commit 6d63d72 into apache:develop Mar 10, 2020
@slievrly slievrly added this to the 1.2.0 milestone Mar 15, 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.

None yet

4 participants