Reduce min inflight for go feeder, and start lower in both go and java

4 files changed, 7 insertions, 7 deletions

diff --git a/client/go/internal/vespa/document/throttler.go b/client/go/internal/vespa/document/throttler.go
index 39900156563..dea2dc1c67e 100644
--- a/client/go/internal/vespa/document/throttler.go
+++ b/client/go/internal/vespa/document/throttler.go
@@ -37,8 +37,8 @@ type dynamicThrottler struct {
 
 func newThrottler(connections int, nowFunc func() time.Time) *dynamicThrottler {
 	var (
-		minInflight = 16 * int64(connections)
-		maxInflight = 256 * minInflight // 4096 max streams per connection on the server side
+		minInflight = 2 * int64(connections)
+		maxInflight = 256 * minInflight // 512 max streams per connection on the server side
 	)
 	t := &dynamicThrottler{
 		minInflight: minInflight,
@@ -49,7 +49,7 @@ func newThrottler(connections int, nowFunc func() time.Time) *dynamicThrottler {
 		start: nowFunc(),
 		now:   nowFunc,
 	}
-	t.targetInflight.Store(8 * minInflight)
+	t.targetInflight.Store(minInflight)
 	t.targetTimesTen.Store(10 * maxInflight)
 	return t
 }
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java b/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java
index 97f681404e9..1a42b688437 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java
@@ -167,10 +167,10 @@ public class DynamicThrottlePolicy extends StaticThrottlePolicy {
     }
 
     /**
-     * Determines where on each latency level the attractor sits. 2 is at the very end, and makes this to *boom*.
+     * Determines where on each latency level the attractor sits. 2 is at the very end, and makes this go *boom*.
      * 0.2 is at the very start, and makes the algorithm more conservative. Probably fine to stay away from this.
      */
-    // Original javadoc is non-sense, but kept for historical reasons.
+    // Original javadoc is nonsense, but kept for historical reasons.
     /*
      * Sets the lower efficiency threshold at which the algorithm should perform window size back off. Efficiency is
      * the correlation between throughput and window size. The algorithm will increase the window size until efficiency
diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/DynamicThrottler.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/DynamicThrottler.java
index 951a1776b6f..31d91ec3530 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/DynamicThrottler.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/DynamicThrottler.java
@@ -28,7 +28,7 @@ public class DynamicThrottler extends StaticThrottler {
 
     public DynamicThrottler(FeedClientBuilderImpl builder) {
         super(builder);
-        targetInflight = new AtomicLong(8 * minInflight);
+        targetInflight = new AtomicLong(minInflight);
     }
 
     @Override
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 9010b0a7ad8..f0ee434e87c 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
@@ -22,7 +22,7 @@ public class StaticThrottler implements Throttler {
 
     public StaticThrottler(FeedClientBuilderImpl builder) {
         minInflight = 2L * builder.connectionsPerEndpoint * builder.endpoints.size();
-        maxInflight = 256 * minInflight; // 4096 max streams per connection on the server side.
+        maxInflight = 256 * minInflight; // 512 max streams per connection on the server side.
         targetX10 = new AtomicLong(10 * maxInflight); // 10x the actual value to allow for smaller updates.
     }