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.

Sign up for GitHub

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

Jump to bottom

bugfix: xa mode originalConnection closed #4169

Merged
merged 5 commits into from
Dec 4, 2021
Merged

bugfix: xa mode originalConnection closed #4169

merged 5 commits into from
Dec 4, 2021

Conversation

lcmvs
Copy link
Contributor

@lcmvs lcmvs commented Dec 3, 2021 •
edited
Loading

  • I have registered the PR changes.

Ⅰ. Describe what this PR did

xa模式originalConnection已关闭，导致二阶段无法执行，无限重试

Ⅱ. Does this pull request fix one issue?

fixed #4167

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

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

funky-eyes
funky-eyes approved these changes Dec 3, 2021
View reviewed changes
Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM please register your personal information and PR in the two 1.5.0.md files in the Changes folder

@funky-eyes funky-eyes added this to the 1.5.0 milestone Dec 3, 2021
@funky-eyes funky-eyes added module/rm-datasource rm-datasource module type: bug Category issues or prs related to bug. labels Dec 3, 2021
lcmvs added 3 commits December 3, 2021 09:44
@lcmvs
fix
4879e0f
@lcmvs
fix
53e14b8
@lcmvs
Merge branch 'develop' into xa_original_connection_already_closed
add5282 
# Conflicts:
#	changes/1.5.0.md
#	changes/en-us/1.5.0.md
@funky-eyes funky-eyes requested a review from slievrly December 3, 2021 09:59
@codecov-commenter
Copy link

codecov-commenter commented Dec 4, 2021 •
edited
Loading

Codecov Report

Merging #4169 (ce7ed20) into develop (57789c2) will increase coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             develop    #4169   +/-   ##
==========================================
  Coverage      49.38%   49.39%           
- Complexity      3762     3763    +1     
==========================================
  Files            700      700           
  Lines          23656    23658    +2     
  Branches        2924     2925    +1     
==========================================
+ Hits           11682    11685    +3     
  Misses         10774    10774           
+ Partials        1200     1199    -1
Impacted Files Coverage Δ
...ta/rm/datasource/xa/AbstractDataSourceProxyXA.java 6.25% <0.00%> (-0.90%) ⬇️
...n/src/main/java/io/seata/common/util/IdWorker.java 83.33% <0.00%> (+6.25%) ⬆️

slievrly
slievrly approved these changes Dec 4, 2021
View reviewed changes
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 0a3b496 into apache:develop Dec 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slievrly slievrly slievrly approved these changes

@funky-eyes funky-eyes funky-eyes approved these changes

Assignees
No one assigned
Labels
module/rm-datasource rm-datasource module type: bug Category issues or prs related to bug.
Projects
None yet
Milestone
1.5.0 (1.5.1)
Development

Successfully merging this pull request may close these issues.

xa模式originalConnection已关闭，导致二阶段无法执行
4 participants
@lcmvs @codecov-commenter @slievrly @funky-eyes