503 from /doc/v1 is not backpressure, but hopefully transient

2 files changed, 5 insertions, 5 deletions

diff --git a/client/go/internal/vespa/document/dispatcher.go b/client/go/internal/vespa/document/dispatcher.go
index fb7a532e332..b76b6b44016 100644
--- a/client/go/internal/vespa/document/dispatcher.go
+++ b/client/go/internal/vespa/document/dispatcher.go
@@ -110,10 +110,10 @@ func (d *Dispatcher) shouldRetry(op documentOp, result Result) bool {
 		d.throttler.Success()
 		d.circuitBreaker.Success()
 		return false
-	} else if result.HTTPStatus == 429 || result.HTTPStatus == 503 {
+	} else if result.HTTPStatus == 429 {
 		d.throttler.Throttled(d.inflightCount.Load())
 		return true
-	} else if result.Err != nil || result.HTTPStatus == 500 || result.HTTPStatus == 502 || result.HTTPStatus == 504 {
+	} else if result.Err != nil || result.HTTPStatus == 500 || result.HTTPStatus == 502 || result.HTTPStatus == 503 || result.HTTPStatus == 504 {
 		d.circuitBreaker.Failure()
 		if retry {
 			return true
diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/HttpRequestStrategy.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/HttpRequestStrategy.java
index ce86ad59ffe..ebbff9ed84b 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/HttpRequestStrategy.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/HttpRequestStrategy.java
@@ -149,7 +149,7 @@ class HttpRequestStrategy implements RequestStrategy {
         return false;
     }
 
-    /** Retries throttled requests (429, 503), adjusting the target inflight count, and server errors (500, 502). */
+    /** Retries throttled requests (429), adjusting the target inflight count, and server errors (500, 502, 503, 504). */
     private boolean retry(HttpRequest request, HttpResponse response, int attempt) {
         if (response.code() / 100 == 2 || response.code() == 404 || response.code() == 412) {
             logResponse(FINEST, response, request, attempt);
@@ -159,14 +159,14 @@ class HttpRequestStrategy implements RequestStrategy {
         }
 
 
-        if (response.code() == 429 || response.code() == 503) { // Throttling; reduce target inflight.
+        if (response.code() == 429) { // Throttling; reduce target inflight.
             logResponse(FINER, response, request, attempt);
             throttler.throttled((inflight.get() - delayedCount.get()));
             return true;
         }
 
         logResponse(FINE, response, request, attempt);
-        if (response.code() == 500 || response.code() == 502 || response.code() == 504) { // Hopefully temporary errors.
+        if (response.code() == 500 || response.code() == 502 || response.code() == 503 || response.code() == 504) { // Hopefully temporary errors.
             breaker.failure(response);
             return retry(request, attempt);
         }