bugfix: the disposables tree set won't accept another Disposable with the same priority. #3170
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
the same priority. Disposable TmNettyRemotingClient and RmNettyRemotingClient added by GlobalTransactionScanner have the same priority by default, so the RmNettyRemotingClient won't be closed gracefully during shutdown.
Codecov Report
@@ Coverage Diff @@
## develop #3170 +/- ##
=============================================
- Coverage 50.38% 50.32% -0.07%
+ Complexity 3117 3114 -3
=============================================
Files 594 594
Lines 19625 19644 +19
Branches 2438 2443 +5
=============================================
- Hits 9889 9885 -4
- Misses 8743 8763 +20
- Partials 993 996 +3
|
funky-eyes
added
first-time contributor
Codecov Report
@@ Coverage Diff @@
## develop #3170 +/- ##
=============================================
- Coverage 50.95% 50.90% -0.05%
Complexity 3205 3205
=============================================
Files 602 602
Lines 19815 19834 +19
Branches 2470 2475 +5
=============================================
Hits 10096 10096
- Misses 8707 8726 +19
Partials 1012 1012
|
| } | ||
|
|
||
| @Override | ||
| public int compareTo(DisposablePriorityWrapper disposablePriorityWrapper) { | ||
| return priority - disposablePriorityWrapper.priority; |
There was a problem hiding this comment.
use PriorityQueue to replace TreeSet will solve this problem once and forever. No need to add a "seqId" to fix the probem which is actually caused by TreeSet.
jsbxyyx
reviewed
Oct 12, 2020
Comment on lines
+111
to
+119
| if (cmp == 0) { | ||
| if (seqId > disposablePriorityWrapper.seqId) { | ||
| cmp = 1; | ||
| } else if (seqId < disposablePriorityWrapper.seqId) { | ||
| cmp = -1; | ||
| } else { | ||
| cmp = 0; | ||
| } | ||
| } |
Comment on lines
+125
to
+129
| final int prime = 31; | ||
| int result = 1; | ||
| result = prime * result + priority; | ||
| result = prime * result + (int) (seqId ^ (seqId >>> 32)); | ||
| return result; |
funky-eyes
approved these changes
Oct 12, 2020
Comment on lines
+125
to
+129
| final int prime = 31; | ||
| int result = 1; | ||
| result = prime * result + priority; | ||
| result = prime * result + (int) (seqId ^ (seqId >>> 32)); | ||
| return result; |
Comment on lines
+111
to
+119
| if (cmp == 0) { | ||
| if (seqId > disposablePriorityWrapper.seqId) { | ||
| cmp = 1; | ||
| } else if (seqId < disposablePriorityWrapper.seqId) { | ||
| cmp = -1; | ||
| } else { | ||
| cmp = 0; | ||
| } | ||
| } |
hicf
pushed a commit
to hicf/seata
that referenced
this pull request
Nov 15, 2020
… the same priority (apache#3170)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix the following issue:
Disposable TmNettyRemotingClient and RmNettyRemotingClient added by GlobalTransactionScanner have the same priority by default, so the RmNettyRemotingClient won't be closed gracefully during shutdown.