Fix cancel too synchronized in MonoCollect[List] #3053
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
This commit reduces the length of the critical section in cancel() that is synchronized. In particular, it removes upstream cancel() from said critical section. This will prevent a deadlock in case the upstream operator itself uses synchronized block between cancel() and methods that call any of this subscriber's synchronized methods (eg. onNext). Fixes #3052.
OlegDokuka
approved these changes
Jun 3, 2022
|
@simonbasle this PR seems to have been merged on a maintenance branch, please ensure the change is merge-forwarded to intermediate maintenance branches and up to |
simonbasle
added a commit
that referenced
this pull request
Jun 7, 2022
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.
This commit reduces the length of the critical section in MonoCollectList and
MonoCollect cancel() method that is synchronized.
In particular, it removes upstream.cancel() from said critical section.
This will prevent a deadlock in case the upstream operator protects a resource
using synchronization in both its cancel() method and in any other method that
calls the collect subscriber downstream (typically onNext()).
By making the critical section shorter, we ensure that the relevant fields are
read / written to / nulled out correctly while avoiding synchronization on the
calls to the upstream / downstream, hence restoring progress.
Fixes #3052.