Revert "Merge pull request #31177 from vespa-engine/revert-31158-jonmv/start-lower-when-feeding"

This reverts commit dc1d2982e21098e0dee252f229762960259382ac, reversing
changes made to 1073327b4b38213311e992f2c2353a376d3404de.

2 files changed, 10 insertions, 10 deletions

diff --git a/client/go/internal/vespa/document/throttler.go b/client/go/internal/vespa/document/throttler.go
index 39900156563..0400ba1a150 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
 }
@@ -57,7 +57,7 @@ func newThrottler(connections int, nowFunc func() time.Time) *dynamicThrottler {
 func NewThrottler(connections int) Throttler { return newThrottler(connections, time.Now) }
 
 func (t *dynamicThrottler) Sent() {
-	currentInflight := t.targetInflight.Load()
+	currentInflight := t.TargetInflight()
 	t.sent++
 	if t.sent*t.sent*t.sent < 100*currentInflight*currentInflight {
 		return
diff --git a/client/go/internal/vespa/document/throttler_test.go b/client/go/internal/vespa/document/throttler_test.go
index 03f0bc75bdc..410e518e596 100644
--- a/client/go/internal/vespa/document/throttler_test.go
+++ b/client/go/internal/vespa/document/throttler_test.go
@@ -9,14 +9,14 @@ import (
 func TestThrottler(t *testing.T) {
 	clock := &manualClock{tick: time.Second}
 	tr := newThrottler(8, clock.now)
-	for i := 0; i < 100; i++ {
-		tr.Sent()
-	}
-	if got, want := tr.TargetInflight(), int64(1024); got != want {
+	if got, want := tr.TargetInflight(), int64(16); got != want {
 		t.Errorf("got TargetInflight() = %d, but want %d", got, want)
 	}
-	tr.Throttled(5)
-	if got, want := tr.TargetInflight(), int64(128); got != want {
+	for tr.TargetInflight() < int64(18) {
+		tr.Sent()
+	}
+	tr.Throttled(34)
+	if got, want := tr.TargetInflight(), int64(17); got != want {
 		t.Errorf("got TargetInflight() = %d, but want %d", got, want)
 	}
 }