Fix Mono.then not cancelling between Callable sources #2934
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 adds a check of cancellation between two subsequent chained Monos, in the case these Monos are `Callable`. Without it, the cancellation would be kind of ignored and all subsequent Callable Monos would still get invoked. Fixes #2933.
OlegDokuka
approved these changes
Mar 8, 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
Mar 8, 2022
This was referenced Mar 17, 2022
Closed
Merged
gcf-merge-on-green bot
referenced
this pull request
in GoogleCloudPlatform/cloud-sql-jdbc-socket-factory
Mar 25, 2022
….16 (#778) [](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [io.projectreactor:reactor-core](https://togithub.com/reactor/reactor-core) | `3.4.15` -> `3.4.16` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>reactor/reactor-core</summary> ### [`v3.4.16`](https://togithub.com/reactor/reactor-core/releases/v3.4.16) [Compare Source](https://togithub.com/reactor/reactor-core/compare/v3.4.15...v3.4.16) Reactor-Core `3.4.16` is part of **`2020.0.17` Release Train (`Europium` SR17)**. This service release contains a few bugfixes and improvements. #### What's Changed ##### ✨ New features and improvements - Improve BoundedElasticScheduler to be less blocking by [@​simonbasle](https://togithub.com/simonbasle) in [https://github.com/reactor/reactor-core/pull/2909](https://togithub.com/reactor/reactor-core/pull/2909) - Add EmitFailureHandler.busyLoop flavor by [@​Animesh27](https://togithub.com/Animesh27) in [https://github.com/reactor/reactor-core/pull/2943](https://togithub.com/reactor/reactor-core/pull/2943) ##### 🐞 Bug fixes - Fix Mono.then not cancelling between Callable sources by [@​simonbasle](https://togithub.com/simonbasle) in [https://github.com/reactor/reactor-core/pull/2934](https://togithub.com/reactor/reactor-core/pull/2934) ##### 📖 Documentation, Tests and Build - Update Gradle to v7.4 in [https://github.com/reactor/reactor-core/pull/2922](https://togithub.com/reactor/reactor-core/pull/2922) - \[doc] Correct flux subscribe example in faq by [@​liukun2634](https://togithub.com/liukun2634) in [https://github.com/reactor/reactor-core/pull/2924](https://togithub.com/reactor/reactor-core/pull/2924) - Show how-to-fix hints in CI when preliminary steps fail (check of license headers, api compatibility) by [@​simonbasle](https://togithub.com/simonbasle) in [https://github.com/reactor/reactor-core/pull/2932](https://togithub.com/reactor/reactor-core/pull/2932) - \[guide] Remove ref to Swing/SwtScheduler in addons appendix by [@​simonbasle](https://togithub.com/simonbasle) in [https://github.com/reactor/reactor-core/pull/2959](https://togithub.com/reactor/reactor-core/pull/2959) - \[build] Have jcstress part of slowerChecks by [@​simonbasle](https://togithub.com/simonbasle) in [https://github.com/reactor/reactor-core/pull/2958](https://togithub.com/reactor/reactor-core/pull/2958) ##### 🆙 Dependency Upgrades - Update plugin spotless to v6.3.0 in [https://github.com/reactor/reactor-core/pull/2925](https://togithub.com/reactor/reactor-core/pull/2925) - Update plugin bnd to v6.2.0 in [https://github.com/reactor/reactor-core/pull/2941](https://togithub.com/reactor/reactor-core/pull/2941) - Update dependency org.awaitility:awaitility to v4.2.0 in [https://github.com/reactor/reactor-core/pull/2945](https://togithub.com/reactor/reactor-core/pull/2945) - Update dependency ch.qos.logback:logback-classic to v1.2.11 in [https://github.com/reactor/reactor-core/pull/2946](https://togithub.com/reactor/reactor-core/pull/2946) - Update dependency com.tngtech.archunit:archunit to v0.23.1 in [https://github.com/reactor/reactor-core/pull/2940](https://togithub.com/reactor/reactor-core/pull/2940) - Update plugin japicmp to v0.4.0 in [https://github.com/reactor/reactor-core/pull/2948](https://togithub.com/reactor/reactor-core/pull/2948) - Update dependency org.mockito:mockito-core to v4.4.0 in [https://github.com/reactor/reactor-core/pull/2951](https://togithub.com/reactor/reactor-core/pull/2951) - Update plugin download to v5.0.2 in [https://github.com/reactor/reactor-core/pull/2950](https://togithub.com/reactor/reactor-core/pull/2950) #### New Contributors - [@​Animesh27](https://togithub.com/Animesh27) made their first contribution in [https://github.com/reactor/reactor-core/pull/2943](https://togithub.com/reactor/reactor-core/pull/2943) 👍 **Full Changelog**: reactor/reactor-core@v3.4.15...v3.4.16 </details> --- ### Configuration 📅 **Schedule**: "after 8am on Friday,before 12pm on Friday" (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory).
](https://renovatebot.com){kind=link}
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 adds a check of cancellation between two subsequent chained
Monos, in the case these Monos are
Callable.Without it, the cancellation would be kind of ignored and all subsequent
Callable Monos would still get invoked.
Fixes #2933.