-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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
[fix][client] Fix deadlock of NegativeAcksTracker #23651
Merged
Merged
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
github-actions
bot
added
doc-not-needed
Your PR changes do not impact docs
and removed
doc-label-missing
labels
Nov 28, 2024
lhotari
approved these changes
Nov 28, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
lhotari
changed the title
[fix][client] Fix deadlock of NegativeTracker.
[fix][client] Fix deadlock of NegativeAcksTracker
Nov 28, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #23651 +/- ##
============================================
+ Coverage 73.57% 74.34% +0.77%
- Complexity 32624 34996 +2372
============================================
Files 1877 1944 +67
Lines 139502 147240 +7738
Branches 15299 16250 +951
============================================
+ Hits 102638 109472 +6834
- Misses 28908 29318 +410
- Partials 7956 8450 +494
Flags with carried forward coverage won't be shown. Click here to find out more.
|
lhotari
pushed a commit
that referenced
this pull request
Nov 28, 2024
(cherry picked from commit 68eb8f2)
lhotari
pushed a commit
that referenced
this pull request
Nov 28, 2024
(cherry picked from commit 68eb8f2)
lhotari
pushed a commit
that referenced
this pull request
Nov 28, 2024
(cherry picked from commit 68eb8f2)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
cherry-picked/branch-3.0
cherry-picked/branch-3.3
cherry-picked/branch-4.0
doc-not-needed
Your PR changes do not impact docs
release/3.0.8
release/3.3.3
release/4.0.1
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.
Fixes #23650
Motivation
Modifications
Reduce the scope of lock to avoid deadlock, that is release the lock of NegativeAcksTracker in NegativeAcksTracker.triggerRedelivery before acquire the lock of consumer.
Verifying this change
This change added tests and can be verified as follows:
Does this pull request potentially affect one of the following parts:
If the box was checked, please highlight the changes
Documentation
doc
doc-required
doc-not-needed
doc-complete
Matching PR in forked repository
PR in forked repository: thetumbled#67