-
Notifications
You must be signed in to change notification settings - Fork 8.8k
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: treating a unique index conflict during rollback as a dirty write #7135
Conversation
@@ -400,6 +400,8 @@ public void undo(DataSourceProxy dataSourceProxy, String xid, long branchId) thr | |||
if (LOGGER.isInfoEnabled()) { | |||
LOGGER.info("xid {} branch {}, undo_log inserted, retry rollback", xid, branchId); | |||
} | |||
throw new BranchTransactionException(BranchRollbackFailed_Unretriable, String.format( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should not be written here; the exception handling should be done in undoExecutor.executeOn
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 45a151d !
PTAL 🙂
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 2.x #7135 +/- ##
=========================================
Coverage 52.02% 52.03%
+ Complexity 6711 6708 -3
=========================================
Files 1145 1145
Lines 40559 40562 +3
Branches 4737 4737
=========================================
+ Hits 21102 21106 +4
+ Misses 17473 17470 -3
- Partials 1984 1986 +2
|
fbbec09
to
a18d4f5
Compare
a18d4f5
to
45a151d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please register your PR in those two files :
https://github.com/apache/incubator-seata/blob/2.x/changes/zh-cn/2.x.md
https://github.com/apache/incubator-seata/blob/2.x/changes/en-us/2.x.md
Done in fb2eaf2 ! Please check if the Chinese translation is correct. |
fb2eaf2
to
e174cb7
Compare
Co-authored-by: funkye <364176773@qq.com>
Co-authored-by: funkye <364176773@qq.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please make sure your Github ID is in the list below
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch!
Done it 196f218 !
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please make sure your Github ID is in the list below
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Ⅰ. Describe what this PR did
Ⅱ. Does this pull request fix one issue?
fixes #6561
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews