summaryrefslogtreecommitdiffstats
path: root/filedistribution
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-01-08 15:38:13 +0100
committerHarald Musum <musum@oath.com>2018-01-08 15:38:13 +0100
commit5052bb183c0cc3ad54d4204accceae9bbc8f469f (patch)
tree09c3034cc4e5ce323c652843ca71c06cace5c9ef /filedistribution
parentfa9fe82c82d6a562e3ae02b9577f536a16c72c92 (diff)
Be consistent when setting download status, use fraction
Diffstat (limited to 'filedistribution')
-rw-r--r--filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java2
-rw-r--r--filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java2
-rw-r--r--filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java8
3 files changed, 6 insertions, 6 deletions
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
index 5de006cd17c..eb69a1492bf 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
@@ -107,7 +107,7 @@ public class FileDownloader {
} else if (!file.canRead()) {
throw new RuntimeException("File with reference '" + fileReference.value() + "'exists, but unable to read it");
} else {
- fileReferenceDownloader.setDownloadStatus(fileReference, 100.0);
+ fileReferenceDownloader.setDownloadStatus(fileReference, 1.0);
return Optional.of(file);
}
}
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 d3715a1ff89..6fac2becf1b 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -39,7 +39,7 @@ public class FileReferenceDownloader {
Executors.newFixedThreadPool(10, new DaemonThreadFactory("filereference downloader"));
private final ConnectionPool connectionPool;
private final Map<FileReference, FileReferenceDownload> downloads = new LinkedHashMap<>();
- private final Map<FileReference, Double> downloadStatus = new HashMap<>();
+ private final Map<FileReference, Double> downloadStatus = new HashMap<>(); // between 0 and 1
private final Duration downloadTimeout;
private final FileReceiver fileReceiver;
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 d2da020539a..dc19c7521a9 100644
--- a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java
+++ b/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java
@@ -72,7 +72,7 @@ public class FileDownloaderTest {
assertEquals("content", IOUtils.readFile(pathToFile.get()));
// Verify download status when downloaded
- assertDownloadStatus(fileDownloader, fileReference, 100.0);
+ assertDownloadStatus(fileDownloader, fileReference, 1.0);
}
{
@@ -109,7 +109,7 @@ public class FileDownloaderTest {
assertEquals("some other content", IOUtils.readFile(downloadedFile.get()));
// Verify download status when downloaded
- assertDownloadStatus(fileDownloader, fileReference, 100.0);
+ assertDownloadStatus(fileDownloader, fileReference, 1.0);
}
{
@@ -143,7 +143,7 @@ public class FileDownloaderTest {
assertEquals("bar", IOUtils.readFile(downloadedBar));
// Verify download status when downloaded
- assertDownloadStatus(fileDownloader, fileReference, 100.0);
+ assertDownloadStatus(fileDownloader, fileReference, 1.0);
}
}
@@ -174,7 +174,7 @@ public class FileDownloaderTest {
assertEquals("some other content", IOUtils.readFile(downloadedFile.get()));
// Verify download status when downloaded
- assertDownloadStatus(fileDownloader, fileReference, 100.0);
+ assertDownloadStatus(fileDownloader, fileReference, 1.0);
assertEquals(timesToFail, responseHandler.failedTimes);
}