Reduce max inflight requests to respect streams per connection

1 files changed, 4 insertions, 2 deletions

diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/StaticThrottler.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/StaticThrottler.java
index 1f9cf8e5155..4190bd1f580 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/StaticThrottler.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/StaticThrottler.java
@@ -21,8 +21,10 @@ public class StaticThrottler implements Throttler {
     private final AtomicLong targetX10;
 
     public StaticThrottler(FeedClientBuilderImpl builder) {
-        minInflight = 16L * builder.connectionsPerEndpoint * builder.endpoints.size();
-        maxInflight = 256 * minInflight; // 4096 max streams per connection on the server side.
+        minInflight = 4L * builder.connectionsPerEndpoint * builder.endpoints.size();
+        // Add 1 to buffer some extra requests
+        maxInflight = Math.min(builder.maxStreamsPerConnection + 1L, 512)
+                * (builder.connectionsPerEndpoint + 1L) * (long)builder.endpoints.size();
         targetX10 = new AtomicLong(10 * maxInflight); // 10x the actual value to allow for smaller updates.
     }