Enhanced fix for #5855 #5858
Merged
Enhanced fix for #5855 #5858
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
Avoid the race on request queue size by enhancing Pool to track demand.
gregw
commented
Jan 6, 2021
jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java
Outdated
Show resolved
Hide resolved
gregw
commented
Jan 6, 2021
increment demand even if pool is at max size.
removed duplicate code to FutureConnection.
moved pending from Pool to AbstractConnectionPool
fixed javadoc
better atomic usage
updates from review: + always call tryCreate, now passing demanded to indicate if demand should be incremented + simplify demand > supply calculation + if not multiplexing reduce demand on connection failure. If multiplexing, failure will not decrease demand, so some additional connections may be created until supply catches up.
lorban
reviewed
Jan 6, 2021
| { | ||
| int connectionCount = getConnectionCount(); | ||
| if (LOG.isDebugEnabled()) | ||
| LOG.debug("Try creating connection {}/{} with {}/{} pending", connectionCount, getMaxConnectionCount(), getPendingConnectionCount(), maxPending); | ||
| LOG.debug("Try creating connection {}/{} with {} pending", connectionCount, getMaxConnectionCount(), getPendingConnectionCount()); |
There was a problem hiding this comment.
You should log the boolean demanded parameter.
revert to using destination queue size for demand
Fixed test
Fix from review
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
sbordet
approved these changes
Jan 7, 2021
lorban
reviewed
Jan 7, 2021
| @@ -30,6 +29,6 @@ public static Connection acquire(AbstractConnectionPool connectionPool, boolean | |||
|
|
|||
| public static void tryCreate(AbstractConnectionPool connectionPool, int pending) | |||
There was a problem hiding this comment.
This helper is only used for testing, so its signature should have been changed to reflect the new ConnectionPool.tryCreate(boolean) one.
lorban
approved these changes
Jan 7, 2021
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
sbordet
merged commit 6f14c1c
into
jetty-9.4.x-5855_httpclient_may_not_send_queued_request
sbordet
deleted the
jetty-9.4.x-5855_httpclient_may_not_send_queued_request2
branch
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.
Avoid the race on request queue size by enhancing Pool to track demand.