bugfix: modify XA mode pre commit transaction from commit phase to before close phase #7102
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 2.x #7102 +/- ##
============================================
+ Coverage 53.08% 53.14% +0.05%
- Complexity 6795 6806 +11
============================================
Files 1136 1137 +1
Lines 40341 40365 +24
Branches 4723 4729 +6
============================================
+ Hits 21416 21452 +36
+ Misses 16885 16868 -17
- Partials 2040 2045 +5
|
|
I suggest making the title more specific to better describe the bug that has been fixed. |
|
Description added |
xingfudeshi
changed the title
funky-eyes
changed the title
rm-datasource/src/main/java/org/apache/seata/rm/datasource/xa/ConnectionProxyXA.java
Outdated
Show resolved
Hide resolved
| } finally { | ||
| cleanXABranchContext(); | ||
| xaActive = false; |
There was a problem hiding this comment.
这个改成false后，如果通过setAutoCommit触发commit时要怎么办？
After changing this to false, what if the commit is triggered by setAutoCommit?
There was a problem hiding this comment.
这里置为false是因为，自动提交事务第二次调用setAutoCommit时，if (xaActive)这里会调用commit方法，currentAutoCommitStatus在第一次被置为false，进入会继续执行end方法就会报错。
现在commit方法的xaActive = false;逻辑已去掉，setAutoCommit新加了一层判断 if (xaActive && !xaEnded)
| return; | ||
| try { | ||
| if (xaEnded) { | ||
| termination(); |
There was a problem hiding this comment.
我认为prepare这块的逻辑不需要termination
I don't think the logic of preparing this piece needs termination
There was a problem hiding this comment.
已调整commit从调用xaEnd改为end方法，这里已去掉
| long now = System.currentTimeMillis(); | ||
| checkTimeout(now); | ||
| setPrepareTime(now); | ||
| int prepare = xaResource.prepare(xaBranchXid); |
There was a problem hiding this comment.
如果走了rollback的事务不需要prepare，直接上报一阶段失败即可
If the transaction that has gone rollback does not need to be prepared, it can directly report the failure of the first stage
There was a problem hiding this comment.
rollback方法的finally会调用cleanXABranchContext，这里会把xaEnded置为false
| // if kept by a keeper, just hold the connection. | ||
| return; | ||
| try { | ||
| if (xaEnded) { |
There was a problem hiding this comment.
end后的xa事务应该是可以join的，只要没有进入prepare阶段，如果我手动commit或rollback，再接着发sql，这里被标识成了xaended，如何进行prepare？
There was a problem hiding this comment.
接着发sql最终还是会调用commit方法，xaEnded会被置为true，close时依然会进行prepare
funky-eyes
added
type: bug
…gyeyu0/incubator-seata into bugfix-xa-close-prepare
| @@ -117,6 +117,10 @@ private void xaEnd(XAXid xaXid, int flags) throws XAException { | |||
| if (!xaEnded) { | |||
| xaResource.end(xaXid, flags); | |||
| xaEnded = true; | |||
| } else { | |||
| if (flags == XAResource.TMSUCCESS) { | |||
There was a problem hiding this comment.
为什么只有TMSUCCESS才需要end？join进来的不再end了吗？
假设事务1 commit，事务2继续用这个connection commit（等于先join）走到这个xaend，就不执行xaend了？还有rollback的时候会走到这个xaend方法，此时rollback不直接end，直接进行rollback吗？
There was a problem hiding this comment.
xaEnded为false的时候会xaResource.end，这里flags == XAResource.TMSUCCESS是为了事务2继续用这个connection commit时能够xaResource.end，因为第一次commit把xaEnded置为true了
There was a problem hiding this comment.
@xiaoxiangyeyu0 我看到只在close的时候至为false
There was a problem hiding this comment.
xaEnded默认是false，第一次调用xaEnd方法会把xaEnded置为true
There was a problem hiding this comment.
connection没有close时直接复用，xaended就是true了，如何再次end？ @xiaoxiangyeyu0
There was a problem hiding this comment.
传入的flags值为XAResource.TMSUCCESS，走else的分支会执行end
# Conflicts: # rm-datasource/src/main/java/org/apache/seata/rm/datasource/xa/ConnectionProxyXA.java
Ⅰ. Describe what this PR did
Modify XA mode pre commit transaction from commit phase to before close phase
Ⅱ. Does this pull request fix one issue?
fixes #7100
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
link #7100
Ⅴ. Special notes for reviews