Fix WebClient response cancellation race - #37205
Open
jonathansp wants to merge 1 commit into
Open
Conversation
Keep track while the response is being delivered. When cancellation happens during that call, allow WebClient to finish without subscribing again to a body that Spring is already draining. Keep the existing error when code subscribes to the body after response delivery is complete. Closes spring-projectsgh-37204 Signed-off-by: Jonathan Prates <jonathan.prates@transferwise.com>
spring-projects-issues
added
the
status: waiting-for-triage
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 fixes a race in
WebClientwhen the exchange is cancelled exactly while the response is being delivered to the subscriber. In that window the connector already calledreleaseAfterCancel(...), so the response state becomes2(cancelled). If the caller then subscribes to the body as part of the same delivery,getBody()sees state2and throws:The connection is also not released, so the next request can not reuse it.
The fix delivers the response through
Mono.create(clientResponse::deliver)and tracks aresponseDeliveryInProgressflag. When cancellation happens during delivery, the body completes empty instead of throwing, and the connection is released. The old error stays for the real misuse case: subscribing to the body after delivery already finished.Closes gh-37204