INT-3722: Fix Timing Issue TCP OG and Cached CF #1452
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
|
@artembilan Since we're not building M1 until tomorrow now, we can change the JIRA to M1 if you are able to review this in time. |
|
fixed final modifier; squashed |
JIRA: https://jira.spring.io/browse/INT-3722 The TCP outbound gateway correlates replies based on the connection id. When a `CachingClientConnectionFactory` is being used, the connection is returned to the pool too early, and can be reused. It is possible that the current thread then removes the "next" pending reply from the correlation map. Add code to the `CachingClientConnectionFactory` so that the "self" close from the connection (called after `onMessage`) is deferred and the actual close (return to cache) is controlled by the gateway itself. This mechanism will no longer be needed when INT-3654 is resolved (removal of the "self" closing by connections). At that time, connection users (such as the gateway) will be in complete control.
|
Added trap to avoid late add to |
| @@ -155,6 +156,9 @@ protected Object handleRequestMessage(Message<?> requestMessage) { | |||
| logger.debug("released semaphore"); | |||
| } | |||
| } | |||
| if (this.connectionFactory instanceof CloseDeferrable) { | |||
| ((CloseDeferrable) this.connectionFactory).closeDeferred(connectionId); | |||
There was a problem hiding this comment.
OK. I worried how we closed a connection before (or even right now artificially) and found that CachedConnection does that itself in the onMessage.
So, merging as is, but we reall should rethink how it works and who is responsible for what.
There was a problem hiding this comment.
Yes; the responsibility is wrong; but fixing it would be too big a change for a point release (hence the reference to INT-3654).
Thanks
|
Merged and cherry-picked |
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.
JIRA: https://jira.spring.io/browse/INT-3722
The TCP outbound gateway correlates replies based on the connection id.
When a
CachingClientConnectionFactoryis being used, the connection isreturned to the pool too early, and can be reused. It is possible that
the current thread then removes the "next" pending reply from the correlation map.
Add code to the
CachingClientConnectionFactoryso that the "self" close from theconnection (called after
onMessage) is deferred and the actual close (return to cache)is controlled by the gateway itself.
This mechanism will no longer be needed when INT-3654 is resolved (removal of the "self"
closing by connections). At that time, connection users (such as the gateway) will be
in complete control.
cherry-pick to 4.1.x