Merge pull request #5445 from vespa-engine/hmusum/always-set-error-for-connection-if-invalid-response

Always set error for connection if response is invalid

1 files changed, 2 insertions, 6 deletions

diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
index f8e990a264a..04e5f1a9577 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -5,7 +5,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.yahoo.concurrent.DaemonThreadFactory;
 import com.yahoo.config.FileReference;
-import com.yahoo.jrt.ErrorCode;
 import com.yahoo.jrt.Int32Value;
 import com.yahoo.jrt.Request;
 import com.yahoo.jrt.StringValue;
@@ -125,11 +124,8 @@ public class FileReferenceDownloader {
             }
         } else {
             log.log(LogLevel.DEBUG, "Request failed. Req: " + request + "\nSpec: " + connection.getAddress() +
-                    ", error code: " + request.errorCode());
-            if (request.isError() && request.errorCode() == ErrorCode.CONNECTION || request.errorCode() == ErrorCode.TIMEOUT) {
-                log.log(LogLevel.DEBUG, "Mark connection " + connection.getAddress() + " with error");
-                connectionPool.setError(connection, request.errorCode());
-            }
+                    ", error code: " + request.errorCode() + ", set error for connection and use another for next request");
+            connectionPool.setError(connection, request.errorCode());
             return false;
         }
     }