bugfix: xa resource suspension #4228

lcmvs · 2021-12-23T08:24:36Z

I have registered the PR changes.

Ⅰ. Describe what this PR did

修复xa模式获取channel导致的资源悬挂问题

增加一个特殊的二阶段重试状态：PhaseTwo_RollbackFailed_XAER_NOTA_Retryable和PhaseTwo_CommitFailed_XAER_NOTA_Retryable
rm出现XAException.XAER_NOTA，返回PhaseTwo_RollbackFailed_XAER_NOTA_Retryable或PhaseTwo_CommitFailed_XAER_NOTA_Retryable
tc回滚如果返回PhaseTwo_RollbackFailed_XAER_NOTA_Retryable或PhaseTwo_CommitFailed_XAER_NOTA_Retryable，重试60s，超时直接当作PhaseTwo_Rollbacked
xa模式一阶段执行超过60s，直接回滚，抛异常。
xa模式检查hold住的连接，如果一阶段完成，等待二阶段超过10s，直接将物理连接关闭，一方面防止资源悬挂，还能防止连接hold住时间过长。

Ⅱ. Does this pull request fix one issue?

fixed #4138

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

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

# Conflicts: # common/src/main/java/io/seata/common/DefaultValues.java # core/src/main/java/io/seata/core/constants/ConfigurationKeys.java

server/src/main/java/io/seata/server/coordinator/DefaultCore.java

rm-datasource/src/main/java/io/seata/rm/datasource/xa/RmNettyClientTimeoutCheckerHookXA.java

rm-datasource/src/main/java/io/seata/rm/datasource/xa/ConnectionProxyXA.java

server/src/main/java/io/seata/server/transaction/xa/XACore.java

codecov-commenter · 2021-12-24T10:45:51Z

Codecov Report

Merging #4228 (01482c4) into develop (abe196f) will decrease coverage by 0.01%.
The diff coverage is 32.18%.

❗ Current head 01482c4 differs from pull request most recent head a34010f. Consider uploading reports for the commit a34010f to get more accurate results

@@              Coverage Diff              @@
##             develop    #4228      +/-   ##
=============================================
- Coverage      49.27%   49.26%   -0.02%     
- Complexity      4068     4071       +3     
=============================================
  Files            731      731              
  Lines          25370    25462      +92     
  Branches        3146     3156      +10     
=============================================
+ Hits           12501    12543      +42     
- Misses         11539    11583      +44     
- Partials        1330     1336       +6

Impacted Files	Coverage Δ
...c/main/java/io/seata/common/ConfigurationKeys.java	`0.00% <ø> (ø)`
...n/src/main/java/io/seata/common/DefaultValues.java	`0.00% <ø> (ø)`
...c/main/java/io/seata/core/context/RootContext.java	`46.77% <0.00%> (-2.38%)`	⬇️
...e/protocol/transaction/BranchRegisterResponse.java	`86.66% <ø> (ø)`
...ta/core/rpc/netty/AbstractNettyRemotingClient.java	`18.62% <ø> (ø)`
...a/io/seata/rm/datasource/xa/ResourceManagerXA.java	`14.54% <12.50%> (+0.25%)`	⬆️
.../java/io/seata/server/coordinator/DefaultCore.java	`53.61% <16.66%> (-2.88%)`	⬇️
.../autoconfigure/properties/client/RmProperties.java	`39.62% <25.00%> (-2.60%)`	⬇️
...oconfigure/properties/server/ServerProperties.java	`28.57% <25.00%> (-0.60%)`	⬇️
...a/io/seata/rm/datasource/xa/ConnectionProxyXA.java	`54.96% <48.27%> (-1.49%)`	⬇️
... and 8 more

rm-datasource/src/main/java/io/seata/rm/BaseDataSourceResource.java

rm-datasource/src/main/java/io/seata/rm/datasource/xa/ConnectionProxyXA.java

rm-datasource/src/main/java/io/seata/rm/datasource/xa/ResourceManagerXA.java

funky-eyes

LGTM

# Conflicts: # changes/1.5.0.md # changes/en-us/1.5.0.md # common/src/main/java/io/seata/common/DefaultValues.java # core/src/main/java/io/seata/core/constants/ConfigurationKeys.java # seata-spring-autoconfigure/seata-spring-autoconfigure-client/src/main/java/io/seata/spring/boot/autoconfigure/properties/client/RmProperties.java

funky-eyes · 2022-02-27T14:13:32Z

@slievrly PTAL

# Conflicts: # changes/1.5.0.md # changes/en-us/1.5.0.md # core/src/main/java/io/seata/core/constants/ConfigurationKeys.java

...rc/main/java/io/seata/serializer/seata/protocol/transaction/BranchRegisterResponseCodec.java

# Conflicts: # changes/1.5.0.md # common/src/main/java/io/seata/common/ConfigurationKeys.java

slievrly · 2022-04-04T17:58:56Z

rm-datasource/src/main/java/io/seata/rm/datasource/xa/ConnectionProxyXA.java

@@ -185,6 +204,12 @@ public synchronized void commit() throws SQLException {
        try {
            end(XAResource.TMSUCCESS);
            xaResource.prepare(xaBranchXid);
+            long now = System.currentTimeMillis();


The timeout calculation should not include the time when the database executes XA prepare. Xa prepare is a time-consuming operation. if the branch timeout can be executed directly xa rollback without the need for xa prepare.

超时计算不应该包含数据库prepare的时间，xa prepare 是一个耗时代价比较高的操作，如果分支超时可以直接xa rollback 而不需要 xa prepare.

slievrly · 2022-04-04T18:04:23Z

All configuration items need to be included in the following locations:
https://github.com/seata/seata/tree/develop/script
https://github.com/seata/seata/blob/develop/server/src/main/resources/application.example.yml

… fix_xa_resource_suspension

slievrly · 2022-04-06T13:26:48Z

rm-datasource/src/main/java/io/seata/rm/datasource/xa/ConnectionProxyXA.java

@@ -49,7 +57,13 @@
    private volatile boolean kept = false;

    private volatile boolean rollBacked = false;
-
+
+    private volatile Long branchRegisterTime = null;


why do these transaction contexts not need to be cleaned up when close？

slievrly

LGTM

lcmvs and others added 12 commits December 13, 2021 14:07

add timeout

7d7efe3

fix xa resource suspension

4e13e4b

fix

9edf998

fix

8c3da26

fix

f5811ed

Merge branch 'develop' into fix_xa_resource_suspension

de12002

# Conflicts: # common/src/main/java/io/seata/common/DefaultValues.java # core/src/main/java/io/seata/core/constants/ConfigurationKeys.java

fix

d692f74

fix

87082fa

fix

e417360

fix

701afdd

fix

c8c7e01

fix

f6a1d55

funky-eyes changed the title ~~Fix xa resource suspension~~ bugfix: xa resource suspension Dec 23, 2021

funky-eyes added this to the 1.5.0 milestone Dec 23, 2021

funky-eyes added module/rm-datasource rm-datasource module module/server server module type: bug Category issues or prs related to bug. labels Dec 23, 2021

lcmvs added 2 commits December 23, 2021 20:09

fix

6ccbfc3

fix

57d080b

funky-eyes reviewed Dec 23, 2021

View reviewed changes

add junit

acca8aa

lcmvs and others added 5 commits December 27, 2021 16:00

fix

a1d42f2

fix

78f8a53

fix

a6cae14

Merge branch 'develop' into fix_xa_resource_suspension

dce332a

Merge branch 'develop' into fix_xa_resource_suspension

2db0b44

funky-eyes reviewed Jan 1, 2022

View reviewed changes

slievrly and others added 2 commits January 4, 2022 11:29

Merge branch 'develop' into fix_xa_resource_suspension

7adbb31

fix

77a537e

fix

e053b8b

funky-eyes reviewed Jan 14, 2022

View reviewed changes

rm-datasource/src/main/java/io/seata/rm/datasource/xa/ResourceManagerXA.java Show resolved Hide resolved

lcmvs added 2 commits January 15, 2022 13:14

fix

1fcc8c6

fix

5de51cc

funky-eyes approved these changes Jan 16, 2022

View reviewed changes

lcmvs added 2 commits January 17, 2022 09:57

Merge branch 'seata:develop' into fix_xa_resource_suspension

54fad8f

fix

425c109

funky-eyes requested a review from slievrly January 20, 2022 03:19

lcmvs and others added 2 commits January 29, 2022 10:16

Merge branch 'develop' into fix_xa_resource_suspension

e0a619c

lcmvs added 2 commits March 1, 2022 16:48

Merge branch 'develop' into fix_xa_resource_suspension

21f141f

# Conflicts: # changes/1.5.0.md # changes/en-us/1.5.0.md # core/src/main/java/io/seata/core/constants/ConfigurationKeys.java

fix

c7d1f29

slievrly reviewed Mar 19, 2022

View reviewed changes

...rc/main/java/io/seata/serializer/seata/protocol/transaction/BranchRegisterResponseCodec.java Outdated Show resolved Hide resolved

lcmvs and others added 6 commits March 22, 2022 16:35

Merge branch 'develop' into fix_xa_resource_suspension

a6b3017

# Conflicts: # changes/1.5.0.md # common/src/main/java/io/seata/common/ConfigurationKeys.java

use RootContext

79839d0

fix

c9093d5

fix

b89ffbd

Merge branch 'develop' into fix_xa_resource_suspension

cfe64cd

Merge branch 'develop' into fix_xa_resource_suspension

66b40cf

slievrly reviewed Apr 4, 2022

View reviewed changes

lcmvs added 2 commits April 6, 2022 16:59

fix

c3c2fcd

Merge remote-tracking branch 'origin/fix_xa_resource_suspension' into…

122f366

… fix_xa_resource_suspension

slievrly reviewed Apr 6, 2022

View reviewed changes

lcmvs and others added 3 commits April 7, 2022 17:14

fix

01482c4

clean context

93c54ee

Merge branch 'develop' into fix_xa_resource_suspension

a34010f

slievrly approved these changes Apr 8, 2022

View reviewed changes

slievrly merged commit 4a69bde into apache:develop Apr 8, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bugfix: xa resource suspension #4228

bugfix: xa resource suspension #4228

lcmvs commented Dec 23, 2021

codecov-commenter commented Dec 24, 2021 •

edited

funky-eyes left a comment

funky-eyes commented Feb 27, 2022

slievrly Apr 4, 2022

lcmvs Apr 6, 2022

slievrly commented Apr 4, 2022

slievrly Apr 6, 2022

slievrly left a comment

bugfix: xa resource suspension #4228

bugfix: xa resource suspension #4228

Conversation

lcmvs commented Dec 23, 2021

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

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

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

codecov-commenter commented Dec 24, 2021 • edited

Codecov Report

funky-eyes left a comment

Choose a reason for hiding this comment

funky-eyes commented Feb 27, 2022

slievrly Apr 4, 2022

Choose a reason for hiding this comment

lcmvs Apr 6, 2022

Choose a reason for hiding this comment

slievrly commented Apr 4, 2022

slievrly Apr 6, 2022

Choose a reason for hiding this comment

slievrly left a comment

Choose a reason for hiding this comment

codecov-commenter commented Dec 24, 2021 •

edited