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: fix rollback event repeated and some event status not correct #4533

Merged
merged 17 commits into from Oct 31, 2022

Conversation

Bughue
Copy link
Contributor

@Bughue Bughue commented Apr 7, 2022

  • I have registered the PR changes.

Ⅰ. Describe what this PR did

解决#4531 提到的问题
1 是handleRetryCommitting超时后直接发了event,但没有endCommit
---- 改造成endCommitFail
---- (#4551 改造之后仍然有这个问题)

2 是endRollbackFailed自带了postTcSessionEndEvent(),下面还再发一次,事件重复了
----去掉外层的event,保留新方法里面的event
---- (#4551 改造之后仍然有这个问题,但发的是两个不同状态的event)

commit的处理同理

Ⅱ. Does this pull request fix one issue?

fixes #4531

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

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@Bughue Bughue changed the title LIMIT_DELETE_BY_DATE bugfix: fix retry timeout event repeated and changing status invalid Apr 7, 2022
@Bughue Bughue changed the title bugfix: fix retry timeout event repeated and changing status invalid bugfix: fix retry timeout event repeated Apr 7, 2022
funky-eyes and others added 4 commits April 9, 2022 18:58
…_remove

� Conflicts:
�	server/src/main/java/io/seata/server/coordinator/DefaultCoordinator.java
�	server/src/main/java/io/seata/server/session/SessionHelper.java
@Bughue Bughue changed the title bugfix: fix retry timeout event repeated bugfix: fix rollback event repeated and some event status not correct Apr 19, 2022
Bughue and others added 4 commits April 19, 2022 12:33
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

@funky-eyes funky-eyes added this to the 1.6.0 milestone Aug 11, 2022
@funky-eyes funky-eyes added type: bug Category issues or prs related to bug. module/server server module labels Aug 11, 2022
…_remove

� Conflicts:
�	server/src/main/java/io/seata/server/session/SessionHelper.java
@codecov-commenter
Copy link

codecov-commenter commented Aug 22, 2022

Codecov Report

Merging #4533 (feb1d9e) into develop (6d6eb2e) will decrease coverage by 0.03%.
The diff coverage is 66.66%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #4533      +/-   ##
=============================================
- Coverage      49.06%   49.03%   -0.04%     
+ Complexity      4093     4089       -4     
=============================================
  Files            733      733              
  Lines          26005    26012       +7     
  Branches        3212     3213       +1     
=============================================
- Hits           12760    12755       -5     
- Misses         11886    11895       +9     
- Partials        1359     1362       +3     
Impacted Files Coverage Δ
...o/seata/server/coordinator/DefaultCoordinator.java 47.54% <50.00%> (-0.22%) ⬇️
...in/java/io/seata/server/session/SessionHelper.java 66.34% <70.00%> (-1.37%) ⬇️
...ava/io/seata/server/metrics/MetricsSubscriber.java 78.26% <0.00%> (-6.09%) ⬇️
...in/java/io/seata/server/session/GlobalSession.java 81.00% <0.00%> (-0.78%) ⬇️
...erver/storage/file/session/FileSessionManager.java 49.04% <0.00%> (-0.64%) ⬇️
...torage/file/store/FileTransactionStoreManager.java 56.27% <0.00%> (+0.64%) ⬆️

@xingfudeshi xingfudeshi self-requested a review October 19, 2022 08:08
Copy link
Member

@xingfudeshi xingfudeshi left a comment

Choose a reason for hiding this comment

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

LGTM

@funky-eyes funky-eyes merged commit 84e8756 into apache:develop Oct 31, 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

from the normative point of view, the buried logic of metrics should sink into the behavioral action method.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
module/server server module type: bug Category issues or prs related to bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

RetryTimeout event repeated and status not match
5 participants