Merge pull request #17626 from vespa-engine/hmusum/switch-only-when-current-connection-is-failing

Switch connection only when the current one is failing [run-systemtest]

2 files changed, 3 insertions, 13 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 05fbd457a0d..da9d4ceab88 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -127,7 +127,7 @@ public class FileReferenceDownloader {
                 return true;
             } else {
                 log.log(logLevel, "File reference '" + fileReference + "' not found at " + connection.getAddress());
-                connectionPool.switchConnection();
+                connectionPool.switchConnection(connection);
                 return false;
             }
         } else {
diff --git a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java b/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java
index 1344b7afbb3..61575b650ce 100644
--- a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java
+++ b/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java
@@ -314,14 +314,6 @@ public class FileDownloaderTest {
         }
 
         @Override
-        public void setError(int errorCode) {
-        }
-
-        @Override
-        public void setSuccess() {
-        }
-
-        @Override
         public String getAddress() {
             return null;
         }
@@ -331,9 +323,7 @@ public class FileDownloaderTest {
         }
 
         @Override
-        public void setError(Connection connection, int errorCode) {
-            connection.setError(errorCode);
-        }
+        public void setError(Connection connection, int errorCode) { }
 
         @Override
         public Connection getCurrent() {
@@ -341,7 +331,7 @@ public class FileDownloaderTest {
         }
 
         @Override
-        public Connection switchConnection() {
+        public Connection switchConnection(Connection connection) {
             return this;
         }