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: rollback active xa connection fail #5131

Merged
merged 6 commits into from Dec 6, 2022
Merged

Conversation

funky-eyes
Copy link
Contributor

  • I have registered the PR changes.

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

fixes #4710
当tc下发回滚时,rm的xaconnection还处于活动中时无法进行rollback,必须要先end再rollback,而XAER_RMFAIL不同的异常msg是不同的,所以需要对msg内容再做一次判断

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

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@funky-eyes funky-eyes changed the title bugfix: xa connect in the active,rollback fail bugfix: rollback active xaconnect fail Dec 6, 2022
@codecov-commenter
Copy link

codecov-commenter commented Dec 6, 2022

Codecov Report

Merging #5131 (955700b) into develop (614454b) will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #5131      +/-   ##
=============================================
+ Coverage      48.95%   48.97%   +0.01%     
- Complexity      4168     4169       +1     
=============================================
  Files            741      741              
  Lines          26521    26521              
  Branches        3294     3294              
=============================================
+ Hits           12984    12988       +4     
+ Misses         12130    12127       -3     
+ Partials        1407     1406       -1     
Impacted Files Coverage Δ
...a/io/seata/rm/datasource/xa/ConnectionProxyXA.java 56.05% <100.00%> (ø)
...rage/redis/store/RedisTransactionStoreManager.java 75.19% <0.00%> (+0.52%) ⬆️
...torage/file/store/FileTransactionStoreManager.java 56.27% <0.00%> (+0.64%) ⬆️

@funky-eyes funky-eyes changed the title bugfix: rollback active xaconnect fail bugfix: rollback active xa connection fail Dec 6, 2022
@slievrly slievrly added this to the 1.6.0 milestone Dec 6, 2022
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

@slievrly slievrly merged commit c48a356 into apache:develop Dec 6, 2022
zw201913 pushed a commit to zw201913/seata that referenced this pull request Dec 12, 2022
…o 1114_for_5073

* '1114_for_5073' of https://github.com/zw201913/seata:
  bugfix: hikari datasource auto proxy fail (apache#5134)
  bugfix: rollback active xa connection fail (apache#5131)
  optimize: support oracle on delete tccfence logs  (apache#5124)
  feature: support passing `contextPath` parameter to Nacos client (apache#5111)
  bugfix:NPE caused when there is no @GlobalTransactional annotation on the RM side  (apache#5109)
  bugfix: Druid disable oracle implicit cache (apache#5098)
  bugfix: fix access key loss after server restart (apache#5097)
  optimize: remove druid dependency in ConnectionProxy (apache#5104)
  bugfix:fix ClassNotFoundException during the ZK unit test (apache#5101)
  bugfix: fix when seata and jpa are used together, their AutoConfiguration order is incorrect (apache#5092)
  optimize: lock priority attempts to insert (apache#4681)
  bugfix: update join condition placeholder param error (apache#5052)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

XA全局事务超时后回滚失败,一直报XAER_RMFAIL
3 participants