Allow Addresses to have a max calls per connection #8386
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 adds the ability for the Address Policy to also contain a maximum number of connections per Stream. In some environments it seems that OkHttp's HTTP/2 gets worse the more streams that are packed onto a single connection. By adding in the ability for users to alter their client's AddressPolicy to set a maximum number of connections per stream, they can control how much (if any) packing they want OkHttp to perform.
yschimke
reviewed
Apr 24, 2024
okhttp/src/main/kotlin/okhttp3/internal/connection/RealConnection.kt
Outdated
Show resolved
Hide resolved
yschimke
reviewed
Apr 24, 2024
| @@ -368,6 +384,18 @@ class RealConnection( | |||
| } | |||
| } | |||
|
|
|||
| private fun getMaximumAllocationLimit(): Int { | |||
| // if we have not negotiated a max per streams yet, don't check for the policy override | |||
| val negotiatedMaxCurrentStreams = lastMaxConcurrentStreamsFromSettings ?: return 1 | |||
There was a problem hiding this comment.
Isn't this just defaulted to 1 for Http/1 and Http2Connection.DEFAULT_SETTINGS.getMaxConcurrentStreams() for Http/2?
should it be a lateinit and start sets to one or the other?
There was a problem hiding this comment.
maybe?
private var lastMaxConcurrentStreamsFromSettings = 1 would avoid the early return, but then we're checking against the policy.
Would it be better to have the null and early return or check the policy every time, even if we're not in HTTP/2 land?
ean5533
approved these changes
Apr 24, 2024
peckb1
force-pushed
the
feature.peckb.address-policy-max-calls-per-connection
branch
from
c6a955f
to
96345cf
Compare
peckb1
commented
Apr 24, 2024
| @@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit.MILLISECONDS | |||
| import java.util.concurrent.locks.ReentrantLock | |||
| import javax.net.ssl.SSLPeerUnverifiedException | |||
| import javax.net.ssl.SSLSocket | |||
| import kotlin.concurrent.withLock | |||
There was a problem hiding this comment.
no longer need when the references from lock.withLock were changed to this.withLock
- though that extension function still forwards to
lock.withLockso same concurrent method used one step further.
peckb1
changed the title
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.
Overview
This adds the ability for the Address Policy to also contain a maximum number of connections per Stream.
Additionally creates a ConnectionPoolPolicy which can have default options set up for all connections in the pool.
Context
In some environments it seems that OkHttp's HTTP/2 gets worse the more streams that are packed onto a single connection.
By adding in the ability for users to alter their client's AddressPolicy to set a maximum number of connections per stream, they can control how much (if any) packing they want OkHttp to perform.