Fix deadlock for negative acknowledgment #266
Merged
Conversation
This file contains hidden or 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
Fixes apache#265 ### Modifications Make `timer_` const and `enabledForTesting_` atomic in `NegativeAcksTracker` so that the `mutex_` can be used only for the `nackedMessages_` field. After that, we can unlock `mutex_` in `handleTimer` to avoid the potential deadlock from user-provided logger or intercepter. Add `ConsumerTest.testNegativeAckDeadlock` to verify the fix.
BewareMyPower
requested review from
merlimat,
RobertIndie,
Demogorgon314 and
shibd
shibd
approved these changes
May 6, 2023
BewareMyPower
added a commit
that referenced
this pull request
May 6, 2023
Fixes #265 ### Modifications Make `timer_` const and `enabledForTesting_` atomic in `NegativeAcksTracker` so that the `mutex_` can be used only for the `nackedMessages_` field. After that, we can unlock `mutex_` in `handleTimer` to avoid the potential deadlock from user-provided logger or intercepter. Add `ConsumerTest.testNegativeAckDeadlock` to verify the fix. (cherry picked from commit 8a9b2dc)
BewareMyPower
added a commit
to BewareMyPower/pulsar-client-python
that referenced
this pull request
May 17, 2023
Fixes apache#116 apache/pulsar-client-cpp#266 is included in the C++ client 3.2.0 so that apache#116 will be fixed.
merlimat
pushed a commit
to apache/pulsar-client-python
that referenced
this pull request
May 17, 2023
* Bump the C++ client to 3.2.0 Fixes #116 apache/pulsar-client-cpp#266 is included in the C++ client 3.2.0 so that #116 will be fixed. * Change the download URL since archive.apache.org is not available now * Revert "Change the download URL since archive.apache.org is not available now" This reverts commit 6b92e98.
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.
Fixes #265
Modifications
Make
timer_const andenabledForTesting_atomic inNegativeAcksTrackerso that themutex_can be used only for thenackedMessages_field. After that, we can unlockmutex_inhandleTimerto avoid the potential deadlock from user-provided logger or intercepter.Add
ConsumerTest.testNegativeAckDeadlockto verify the fix.Documentation
doc-required(Your PR needs to update docs and you will update later)
doc-not-needed(Please explain why)
doc(Your PR contains doc changes)
doc-complete(Docs have been already added)