diff options
4 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 786e7c332a4..803b124c825 100644 --- a/client/go/internal/vespa/document/dispatcher.go +++ b/client/go/internal/vespa/document/dispatcher.go @@ -116,7 +116,7 @@ func (d *Dispatcher) shouldRetry(op documentOp, result Result) bool { } 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 == 503 || result.HTTPStatus == 504 { + } else if result.Err != nil || result.HTTPStatus == 503 { d.circuitBreaker.Failure() if op.attempts < maxAttempts { return true diff --git a/client/go/internal/vespa/document/dispatcher_test.go b/client/go/internal/vespa/document/dispatcher_test.go index 4c52bd759d9..d85432474da 100644 --- a/client/go/internal/vespa/document/dispatcher_test.go +++ b/client/go/internal/vespa/document/dispatcher_test.go @@ -38,7 +38,7 @@ func (f *mockFeeder) Send(doc Document) Result { failRequest := (f.failAfterNDocs > 0 && len(f.documents) >= f.failAfterNDocs) || (f.failCount > 0 && f.sendCount <= f.failCount) if failRequest { - result.HTTPStatus = 500 + result.HTTPStatus = 503 result.Status = StatusVespaFailure } else { f.documents = append(f.documents, doc) 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 725462e5d24..4c8a4976a83 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 @@ -166,7 +166,7 @@ class HttpRequestStrategy implements RequestStrategy { } logResponse(FINE, response, request, attempt); - if (response.code() == 500 || response.code() == 502 || response.code() == 503 || response.code() == 504) { // Hopefully temporary errors. + if (response.code() == 503) { // Hopefully temporary errors. breaker.failure(response); return retry(request, attempt); } diff --git a/vespa-feed-client/src/test/java/ai/vespa/feed/client/impl/HttpRequestStrategyTest.java b/vespa-feed-client/src/test/java/ai/vespa/feed/client/impl/HttpRequestStrategyTest.java index 36e81ff4abb..c943e3b139f 100644 --- a/vespa-feed-client/src/test/java/ai/vespa/feed/client/impl/HttpRequestStrategyTest.java +++ b/vespa-feed-client/src/test/java/ai/vespa/feed/client/impl/HttpRequestStrategyTest.java @@ -151,7 +151,7 @@ class HttpRequestStrategyTest { assertEquals(success, serialised.get()); // Some error responses are retried. - HttpResponse serverError = HttpResponse.of(500, null); + HttpResponse serverError = HttpResponse.of(503, null); cluster.expect((__, vessel) -> vessel.complete(serverError)); assertEquals(serverError, strategy.enqueue(id1, request).get()); assertEquals(11, strategy.stats().requests()); @@ -180,7 +180,7 @@ class HttpRequestStrategyTest { codes.put(200, 4L); codes.put(400, 1L); codes.put(429, 2L); - codes.put(500, 3L); + codes.put(503, 3L); assertEquals(codes, stats.responsesByCode()); assertEquals(3, stats.exceptions()); |