bugfix:fix wrong exception information when rollback fails due to dirty data #2333

funky-eyes · 2020-03-02T12:50:07Z

Ⅰ. Describe what this PR did

fix wrong exception information when rollback fails due to dirty data

Ⅱ. Does this pull request fix one issue?

codecov-io · 2020-03-02T13:00:05Z

Codecov Report

Merging #2333 into develop will decrease coverage by 0.17%.
The diff coverage is 33.33%.

@@             Coverage Diff              @@
##             develop   #2333      +/-   ##
============================================
- Coverage      51.77%   51.6%   -0.18%     
+ Complexity      2698    2695       -3     
============================================
  Files            517     517              
  Lines          16752   16740      -12     
  Branches        2033    1995      -38     
============================================
- Hits            8674    8639      -35     
+ Misses          7270    7268       -2     
- Partials         808     833      +25

Impacted Files	Coverage Δ	Complexity Δ
...ing/annotation/GlobalTransactionalInterceptor.java	`9.72% <0%> (-0.14%)`	`2 <0> (ø)`
...ava/io/seata/tm/api/DefaultFailureHandlerImpl.java	`68.57% <0%> (-6.43%)`	`6 <0> (ø)`
...in/java/io/seata/tm/api/TransactionalExecutor.java	`62.96% <100%> (+1.42%)`	`0 <0> (ø)`	⬇️
...in/java/io/seata/tm/api/TransactionalTemplate.java	`66.66% <50%> (-0.63%)`	`24 <0> (ø)`
...obuf/convertor/BranchRegisterRequestConvertor.java	`90.47% <0%> (-9.53%)`	`3% <0%> (ø)`
...otobuf/convertor/BranchReportRequestConvertor.java	`90.9% <0%> (-9.1%)`	`3% <0%> (ø)`
...obuf/convertor/BranchRollbackRequestConvertor.java	`92% <0%> (-8%)`	`3% <0%> (ø)`
...otobuf/convertor/GlobalBeginResponseConvertor.java	`92.59% <0%> (-7.41%)`	`3% <0%> (ø)`
...otobuf/convertor/GlobalStatusRequestConvertor.java	`93.75% <0%> (-6.25%)`	`3% <0%> (ø)`
...otobuf/convertor/GlobalCommitRequestConvertor.java	`93.75% <0%> (-6.25%)`	`3% <0%> (ø)`
... and 24 more

slievrly · 2020-03-02T13:14:49Z

tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java

@@ -143,7 +144,9 @@ private void rollbackTransaction(GlobalTransaction tx, Throwable ex) throws Tran
        tx.rollback();
        triggerAfterRollback();
        // 3.1 Successfully rolled back
-        throw new TransactionalExecutor.ExecutionException(tx, TransactionalExecutor.Code.RollbackDone, ex);
+        throw new TransactionalExecutor.ExecutionException(tx,


I feel that the code you changed is not correct. I think it is OK to throw RollbackDone directly here.

slievrly · 2020-03-02T13:39:58Z

@a364176773 check the code, no problem. However, there are a few minor problems. Tx.getStatus () is a remote call, but in fact status is already available when rollback. The second is that the exception thrown by tx.rollback () must be the rpc exception of the framework and the business rollback fails Both are defined with RollbackFailure, without distinction.

slievrly

LGTM, pr title should be written according to the specification.

slievrly · 2020-03-03T03:46:52Z

@a364176773 Please solve the problem of getStatus to get the remote status, in fact status has been returned in rollback.

funky-eyes · 2020-03-03T03:51:05Z

@a364176773 Please solve the problem of getStatus to get the remote status, in fact status has been returned in rollback.

@slievrly i will submit in additional

optimize:remove redundant configuration (apache#2348)

funky-eyes · 2020-03-05T03:10:14Z

@zjinlei @xingfudeshi PTAL

xingfudeshi · 2020-03-05T04:59:36Z

tm/src/main/java/io/seata/tm/api/DefaultFailureHandlerImpl.java

@@ -67,6 +67,12 @@ public void onRollbackFailure(GlobalTransaction tx, Throwable cause) {
        timer.newTimeout(new CheckTimerTask(tx, GlobalStatus.Rollbacked), SCHEDULE_INTERVAL_SECONDS, TimeUnit.SECONDS);
    }

+    @Override
+    public void onRollbackRetrying(GlobalTransaction tx, Throwable cause) {
+        LOGGER.warn("Failed to rollback transaction[" + tx.getXid() + "]", cause);


Please use {}

@xingfudeshi PTAL

…nto seata_develop

funky-eyes · 2020-03-05T13:24:41Z

@xingfudeshi @zjinlei PTAL

optimize: adjust the processing logic for unsupported listeners (apache#2354)

zjinlei · 2020-03-05T14:03:28Z

tm/src/main/java/io/seata/tm/api/DefaultFailureHandlerImpl.java

+    @Override
+    public void onRollbackRetrying(GlobalTransaction tx, Throwable cause) {
+        StackTraceLogger.info(LOGGER, cause, "Retrying to rollback transaction[{}]", new String[] {tx.getXid()}, null,
+            null);


StackTraceLogger.info(LOGGER, cause, "Retrying to rollback transaction[{}]", new String[] {tx.getXid()}, "Retrying to rollback transaction[{}]", new String[] {tx.getXid()});

StackTraceLogger.info(LOGGER, cause, "Retrying to rollback transaction[{}]", new String[] {tx.getXid()}, "Retrying to rollback transaction[{}]", new String[] {tx.getXid()});

PTAL @zjinlei

…nto seata_develop

optimize: StackTraceLogger

…nto seata_develop

zjinlei

LGTM

fix wrong exception information when rollback fails due to dirty data

5945500

optimize code structure

c9992a0

slievrly reviewed Mar 2, 2020

View reviewed changes

funky-eyes added 2 commits March 2, 2020 22:15

distinguish rollback fails and rollback retrying

3915b39

fix bug

6f81351

slievrly approved these changes Mar 3, 2020

View reviewed changes

funky-eyes changed the title ~~fix wrong exception information when rollback fails due to dirty data~~ bugfix:fix wrong exception information when rollback fails due to dirty data Mar 4, 2020

funky-eyes and others added 6 commits March 4, 2020 15:21

remove redundant configuration

1fc0227

supplementary modification

bfdbbae

Merge branch 'develop' into seata_develop

4b529b7

Merge pull request #22 from seata/develop

3926346

optimize:remove redundant configuration (apache#2348)

adjust the processing logic for unsupported listeners

4ab28d6

be adjusted to warn

e148fda

zjinlei self-assigned this Mar 5, 2020

apache deleted a comment from jovany-wang Mar 5, 2020

Merge branch 'develop' into seata_develop

fb94a97

xingfudeshi reviewed Mar 5, 2020

View reviewed changes

funky-eyes added 2 commits March 5, 2020 21:22

optimize log output

4a4edcd

Merge branch 'seata_develop' of https://github.com/a364176773/seata i…

2544618

…nto seata_develop

Merge pull request #23 from seata/develop

fdafb46

optimize: adjust the processing logic for unsupported listeners (apache#2354)

zjinlei reviewed Mar 5, 2020

View reviewed changes

funky-eyes added 3 commits March 5, 2020 22:16

modify the error configuration name

74a53e2

adjust modification manner

476f0ab

Merge branch 'seata_develop' of https://github.com/a364176773/seata i…

4382d41

…nto seata_develop

funky-eyes added 4 commits March 6, 2020 09:42

Merge pull request #24 from seata/develop

d3e1d24

optimize: StackTraceLogger

Merge branch 'seata_develop' of https://github.com/a364176773/seata i…

c36c1c8

…nto seata_develop

optimize log output

683b0dd

fix bug

fb0e2f7

zjinlei mentioned this pull request Mar 6, 2020

feature:Participant report rollback #2101

Closed

zjinlei approved these changes Mar 6, 2020

View reviewed changes

Merge branch 'develop' into seata_develop

c69fa06

zjinlei merged commit 21e0355 into apache:develop Mar 7, 2020

slievrly added this to the 1.2.0 milestone Mar 15, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bugfix:fix wrong exception information when rollback fails due to dirty data #2333

bugfix:fix wrong exception information when rollback fails due to dirty data #2333

funky-eyes commented Mar 2, 2020

codecov-io commented Mar 2, 2020 •

edited

slievrly Mar 2, 2020

slievrly commented Mar 2, 2020

slievrly left a comment

slievrly commented Mar 3, 2020

funky-eyes commented Mar 3, 2020

funky-eyes commented Mar 5, 2020

xingfudeshi Mar 5, 2020

funky-eyes Mar 6, 2020

funky-eyes commented Mar 5, 2020

zjinlei Mar 5, 2020

funky-eyes Mar 6, 2020

zjinlei left a comment

bugfix:fix wrong exception information when rollback fails due to dirty data #2333

bugfix:fix wrong exception information when rollback fails due to dirty data #2333

Conversation

funky-eyes commented Mar 2, 2020

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

codecov-io commented Mar 2, 2020 • edited

Codecov Report

slievrly Mar 2, 2020

Choose a reason for hiding this comment

slievrly commented Mar 2, 2020

slievrly left a comment

Choose a reason for hiding this comment

slievrly commented Mar 3, 2020

funky-eyes commented Mar 3, 2020

funky-eyes commented Mar 5, 2020

xingfudeshi Mar 5, 2020

Choose a reason for hiding this comment

funky-eyes Mar 6, 2020

Choose a reason for hiding this comment

funky-eyes commented Mar 5, 2020

zjinlei Mar 5, 2020

Choose a reason for hiding this comment

funky-eyes Mar 6, 2020

Choose a reason for hiding this comment

zjinlei left a comment

Choose a reason for hiding this comment

codecov-io commented Mar 2, 2020 •

edited