Do async file distribution (when preparing application) when file distributor disable

Also: Don't cancel future when getting dile references started by async file distribution

2 files changed, 3 insertions, 4 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 05bcaacb107..727786cdc78 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
@@ -54,7 +54,7 @@ public class FileDownloader {
         }
     }
 
-    public Future<Optional<File>> getFutureFile(FileReference fileReference) {
+    private Future<Optional<File>> getFutureFile(FileReference fileReference) {
         Objects.requireNonNull(fileReference, "file reference cannot be null");
         File directory = new File(downloadDirectory, fileReference.value());
         log.log(LogLevel.DEBUG, "Checking if there is a file in '" + directory.getAbsolutePath() + "' ");
@@ -77,7 +77,7 @@ public class FileDownloader {
             if (fileReferenceDownloader.isDownloading(fileReference)) {
                 log.log(LogLevel.DEBUG, "Already downloading '" + fileReference.value() + "'");
             } else {
-                queueForAsyncDownload(fileReference).cancel(false);
+                queueForAsyncDownload(fileReference);
             }
         });
     }
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 b8402c8aacf..509231ba7ff 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -77,7 +77,7 @@ public class FileReferenceDownloader {
     }
 
     void addToDownloadQueue(FileReferenceDownload fileReferenceDownload) {
-        log.log(LogLevel.DEBUG, "Will download file reference '" + fileReferenceDownload.fileReference().value() + "'");
+        log.log(LogLevel.DEBUG, "Will download file reference '" + fileReferenceDownload.fileReference().value() + "' with timeout " + downloadTimeout);
         downloadExecutor.submit(() -> startDownload(downloadTimeout, fileReferenceDownload));
     }
 
@@ -140,7 +140,6 @@ public class FileReferenceDownloader {
             }
         }
         return null;
-
     }
 
     private void execute(Request request, Connection connection) {