summaryrefslogtreecommitdiffstats
path: root/filedistribution
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-05-18 20:15:08 +0200
committerGitHub <noreply@github.com>2020-05-18 20:15:08 +0200
commitde17dc402a0364780205bb4afffbd25d27059fcb (patch)
treeaa02b1e1e4579bc19855b136ed32adfe4944623b /filedistribution
parentf0fd6a1ab95632f1d05ae576f0449ea92576150f (diff)
Revert "Swith to a new connection if possible when asked to do so"
Diffstat (limited to 'filedistribution')
-rw-r--r--filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java3
-rw-r--r--filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java4
2 files changed, 5 insertions, 2 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 6b8a3802a2f..4ee9eacc2be 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -20,6 +20,7 @@ import java.util.Optional;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
import java.util.logging.Logger;
/**
@@ -124,7 +125,7 @@ public class FileReferenceDownloader {
return true;
} else {
log.log(logLevel, "File reference '" + fileReference + "' not found for " + connection.getAddress());
- connectionPool.switchConnection();
+ connectionPool.setNewCurrentConnection();
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 e35e75ce6cc..52d8507acea 100644
--- a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java
+++ b/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java
@@ -341,7 +341,9 @@ public class FileDownloaderTest {
}
@Override
- public Connection switchConnection() { return this; }
+ public Connection setNewCurrentConnection() {
+ return this;
+ }
@Override
public int getSize() {