1 files changed, 23 insertions, 22 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
index dcd2720ae3e..e45c3a8e380 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
@@ -19,6 +19,7 @@ import com.yahoo.vespa.filedistribution.FileReferenceData;
 import com.yahoo.vespa.filedistribution.FileReferenceDownload;
 import com.yahoo.vespa.filedistribution.LazyFileReferenceData;
 import com.yahoo.vespa.filedistribution.LazyTemporaryStorageFileReferenceData;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -27,6 +28,7 @@ import java.nio.file.Path;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -42,7 +44,6 @@ import static com.yahoo.vespa.filedistribution.FileReferenceData.CompressionType
 import static com.yahoo.vespa.filedistribution.FileReferenceData.CompressionType.gzip;
 import static com.yahoo.vespa.filedistribution.FileReferenceData.Type;
 import static com.yahoo.vespa.filedistribution.FileReferenceData.Type.compressed;
-import static com.yahoo.yolean.Exceptions.uncheck;
 
 public class FileServer {
 
@@ -108,26 +109,24 @@ public class FileServer {
     }
 
     private boolean hasFile(FileReference reference) {
-        try {
-            return fileDirectory.getFile(reference).exists();
-        } catch (IllegalArgumentException e) {
-            log.log(Level.FINE, () -> "Failed locating " + reference + ": " + e.getMessage());
-        }
+        Optional<File> file = fileDirectory.getFile(reference);
+        if (file.isPresent())
+            return file.get().exists();
+
+        log.log(Level.FINE, () -> "Failed locating " + reference);
         return false;
     }
 
     FileDirectory getRootDir() { return fileDirectory; }
 
-    void startFileServing(FileReference reference, Receiver target, Set<CompressionType> acceptedCompressionTypes) {
-        File file = fileDirectory.getFile(reference);
-        if ( ! file.exists()) return;
-
+    void startFileServing(FileReference reference, File file, Receiver target, Set<CompressionType> acceptedCompressionTypes) {
+        var absolutePath = file.getAbsolutePath();
         try (FileReferenceData fileData = fileReferenceData(reference, acceptedCompressionTypes, file)) {
-            log.log(Level.FINE, () -> "Start serving " + reference.value() + " with file '" + file.getAbsolutePath() + "'");
+            log.log(Level.FINE, () -> "Start serving " + reference.value() + " with file '" + absolutePath + "'");
             target.receive(fileData, new ReplayStatus(0, "OK"));
-            log.log(Level.FINE, () -> "Done serving " + reference.value() + " with file '" + file.getAbsolutePath() + "'");
+            log.log(Level.FINE, () -> "Done serving " + reference.value() + " with file '" + absolutePath + "'");
         } catch (IOException ioe) {
-            throw new UncheckedIOException("For " + reference.value() + ": failed reading file '" + file.getAbsolutePath() + "'" +
+            throw new UncheckedIOException("For " + reference.value() + ": failed reading file '" + absolutePath + "'" +
                                            " for sending to '" + target.toString() + "'. ", ioe);
         } catch (Exception e) {
             throw new RuntimeException("Failed serving " + reference.value() + " to '" + target + "': ", e);
@@ -177,10 +176,10 @@ public class FileServer {
 
         try {
             var fileReferenceDownload = new FileReferenceDownload(fileReference, client, downloadFromOtherSourceIfNotFound);
-            boolean fileExists = hasFileDownloadIfNeeded(fileReferenceDownload);
-            if ( ! fileExists) return NOT_FOUND;
+            var file = getFileDownloadIfNeeded(fileReferenceDownload);
+            if (file.isEmpty()) return NOT_FOUND;
 
-            startFileServing(fileReference, receiver, acceptedCompressionTypes);
+            startFileServing(fileReference, file.get(), receiver, acceptedCompressionTypes);
         } catch (Exception e) {
             log.warning("Failed serving file reference '" + fileReference + "', request from " + client + " failed with: " + e.getMessage());
             return TRANSFER_FAILED;
@@ -199,9 +198,11 @@ public class FileServer {
                                            acceptedCompressionTypes + ", compression types server can use: " + compressionTypes);
     }
 
-    boolean hasFileDownloadIfNeeded(FileReferenceDownload fileReferenceDownload) {
+    public Optional<File> getFileDownloadIfNeeded(FileReferenceDownload fileReferenceDownload) {
         FileReference fileReference = fileReferenceDownload.fileReference();
-        if (hasFile(fileReference)) return true;
+        Optional<File> file = fileDirectory.getFile(fileReference);
+        if (file.isPresent())
+            return file;
 
         if (fileReferenceDownload.downloadFromOtherSourceIfNotFound()) {
             log.log(Level.FINE, "File not found, downloading from another source");
@@ -210,13 +211,13 @@ public class FileServer {
             FileReferenceDownload newDownload = new FileReferenceDownload(fileReference,
                                                                           fileReferenceDownload.client(),
                                                                           false);
-            boolean fileExists = downloader.getFile(newDownload).isPresent();
-            if ( ! fileExists)
+            file = downloader.getFile(newDownload);
+            if (file.isEmpty())
                 log.log(Level.INFO, "Failed downloading '" + fileReferenceDownload + "'");
-            return fileExists;
+            return file;
         } else {
             log.log(Level.FINE, "File not found, will not download from another source");
-            return false;
+            return Optional.empty();
         }
     }