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

fix #2124 Backport and improve discard handling in UnicastProcessor #2126

Merged
merged 2 commits into from Apr 22, 2020

Conversation

simonbasle
Copy link
Member

@simonbasle simonbasle commented Apr 20, 2020

@simonbasle simonbasle added the area/doOnDiscard This belongs to the doOnDiscard theme label Apr 20, 2020
@simonbasle simonbasle force-pushed the 2124-fixLeaksInUnicastProcessor branch from 9804663 to 2fc5796 Compare April 21, 2020 12:41
@simonbasle simonbasle force-pushed the 2124-fixLeaksInUnicastProcessor branch from 2fc5796 to 586a9c1 Compare April 22, 2020 15:42
simonbasle added a commit that referenced this pull request Apr 22, 2020
This is a follow-up to #2125, this time targeting the same class of
discarding race but on `UnicastProcessor`.

Reviewed-in: #2126
@simonbasle simonbasle marked this pull request as ready for review April 22, 2020 15:42
@simonbasle simonbasle requested a review from a team April 22, 2020 15:43
This is a follow-up to #2125, this time targeting the same class of
discarding race but on `UnicastProcessor`.

As there is a chance that the race references `actual` (to resolve the
discard hook) AFTER `cancel()`, we need to keep that field populated.
It was nulled out for the benefit of `downstreamCount()` (see #980) so
we replace that by a boolean, set to true when subscribed.

Reviewed-in: #2126
@simonbasle simonbasle force-pushed the 2124-fixLeaksInUnicastProcessor branch from 586a9c1 to 9a76624 Compare April 22, 2020 16:31
Copy link
Contributor

@OlegDokuka OlegDokuka left a comment

Choose a reason for hiding this comment

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

LGTM

@simonbasle simonbasle merged commit a013231 into 3.2.x Apr 22, 2020
@reactorbot
Copy link

@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 master 🙇

simonbasle added a commit that referenced this pull request Apr 22, 2020
@simonbasle simonbasle deleted the 2124-fixLeaksInUnicastProcessor branch April 22, 2020 17:25
simonbasle added a commit that referenced this pull request Apr 22, 2020
Conflicts in UnicastProcessor are due to the backport of #2102
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/doOnDiscard This belongs to the doOnDiscard theme
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants