Run all dispatch in the same thread

2 files changed, 4 insertions, 1 deletions

diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/Cluster.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/Cluster.java
index 3de79865898..fde230d3ca4 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/Cluster.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/Cluster.java
@@ -7,6 +7,9 @@ import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
 import java.io.Closeable;
 import java.util.concurrent.CompletableFuture;
 
+/**
+ * Allows dispatch to a Vespa cluster. {@link #dispatch} should be called by a single thread, i.e., it is not thread-safe.
+ */
 interface Cluster extends Closeable {
 
     /** Dispatch the request to the cluster, causing the response vessel to complete at a later time. */
diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/HttpRequestStrategy.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/HttpRequestStrategy.java
index 1b546dd1e42..7a6e2120be6 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/HttpRequestStrategy.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/HttpRequestStrategy.java
@@ -202,7 +202,7 @@ class HttpRequestStrategy implements RequestStrategy {
 
         if (previous == null) {
             acquireSlot();
-            cluster.dispatch(request, vessel);
+            offer(() -> cluster.dispatch(request, vessel));
         }
         else
             previous.whenComplete((__, ___) -> offer(() -> cluster.dispatch(request, vessel)));