From f9cafdf16b977299ea350bc3a8c48616badffa13 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Tue, 2 May 2023 11:39:44 +0200 Subject: Revert "Do not retry SSLException for feed operations" --- .../main/java/ai/vespa/feed/client/impl/HttpRequestStrategy.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'vespa-feed-client') 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 4e2256f40b4..ce86ad59ffe 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 @@ -9,7 +9,6 @@ import ai.vespa.feed.client.FeedException; import ai.vespa.feed.client.HttpResponse ; import ai.vespa.feed.client.OperationStats; -import javax.net.ssl.SSLException; import java.io.IOException; import java.nio.channels.CancelledKeyException; import java.util.Map; @@ -139,9 +138,9 @@ class HttpRequestStrategy implements RequestStrategy { */ private boolean retry(HttpRequest request, Throwable thrown, int attempt) { breaker.failure(thrown); - if ( (thrown instanceof IOException && ! (thrown instanceof SSLException)) // General IO problems, but not SSL, which is irrecoverable. - || (thrown instanceof CancellationException) // TLS session disconnect. - || (thrown instanceof CancelledKeyException)) { // Selection cancelled. + if ( (thrown instanceof IOException) // General IO problems. + || (thrown instanceof CancellationException) // TLS session disconnect. + || (thrown instanceof CancelledKeyException)) { // Selection cancelled. log.log(FINER, thrown, () -> "Failed attempt " + attempt + " at " + request); return retry(request, attempt); } -- cgit v1.2.3