From 7cb76ca350980df5117aed5e673c71aaffb69e6a Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Mon, 14 Jun 2021 19:41:50 +0200
Subject: Move more methods into Downloads

---
 .../com/yahoo/vespa/config/server/filedistribution/FileServer.java | 4 ++--
 .../config/server/maintenance/ApplicationPackageMaintainer.java    | 7 ++++---
 .../yahoo/vespa/config/server/filedistribution/FileServerTest.java | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'configserver')

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 93fabd8d6c0..3c91cea91e1 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
@@ -10,9 +10,9 @@ import com.yahoo.jrt.Request;
 import com.yahoo.jrt.StringValue;
 import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.filedistribution.CompressedFileReference;
+import com.yahoo.vespa.filedistribution.EmptyFileReferenceData;
 import com.yahoo.vespa.filedistribution.FileDownloader;
 import com.yahoo.vespa.filedistribution.FileReferenceData;
-import com.yahoo.vespa.filedistribution.EmptyFileReferenceData;
 import com.yahoo.vespa.filedistribution.FileReferenceDownload;
 import com.yahoo.vespa.filedistribution.LazyFileReferenceData;
 import com.yahoo.vespa.filedistribution.LazyTemporaryStorageFileReferenceData;
@@ -82,7 +82,7 @@ public class FileServer {
         this.downloader = fileDownloader;
         this.root = new FileDirectory(rootDir);
         this.executor = Executors.newFixedThreadPool(Math.max(8, Runtime.getRuntime().availableProcessors()),
-                                                     new DaemonThreadFactory("file server push"));
+                                                     new DaemonThreadFactory("file-server-"));
     }
 
     boolean hasFile(String fileReference) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
index 003b4fbb345..7352f71c032 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
@@ -11,6 +11,7 @@ import com.yahoo.vespa.config.server.session.SessionRepository;
 import com.yahoo.vespa.config.server.tenant.Tenant;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.defaults.Defaults;
+import com.yahoo.vespa.filedistribution.Downloads;
 import com.yahoo.vespa.filedistribution.FileDownloader;
 import com.yahoo.vespa.flags.FlagSource;
 
@@ -52,7 +53,7 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
         int attempts = 0;
         int failures = 0;
 
-        try (var fileDownloader = new FileDownloader(connectionPool, downloadDirectory)) {
+        try (var fileDownloader = new FileDownloader(connectionPool, downloadDirectory, new Downloads())) {
             for (var applicationId : applicationRepository.listApplications()) {
                 log.fine(() -> "Verifying application package for " + applicationId);
                 Session session = applicationRepository.getActiveSession(applicationId);
@@ -65,11 +66,11 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
                 if (applicationPackage != null) {
                     attempts++;
                     if (! fileReferenceExistsOnDisk(downloadDirectory, applicationPackage)) {
-                        log.fine(() -> "Downloading missing application package for application " + applicationId + " - session " + sessionId);
+                        log.fine(() -> "Downloading missing application package for application " + applicationId + " (session " + sessionId + ")");
 
                         if (fileDownloader.getFile(applicationPackage).isEmpty()) {
                             failures++;
-                            log.warning("Failed to download application package for application " + applicationId + " - session " + sessionId);
+                            log.warning("Failed to download application package for application " + applicationId + " (session " + sessionId + ")");
                             continue;
                         }
                     }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
index 6ce94aa8499..d981f7b13d9 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
@@ -5,6 +5,7 @@ import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.FileReference;
 import com.yahoo.io.IOUtils;
 import com.yahoo.net.HostName;
+import com.yahoo.vespa.filedistribution.Downloads;
 import com.yahoo.vespa.filedistribution.FileDownloader;
 import com.yahoo.vespa.filedistribution.FileReferenceData;
 import com.yahoo.vespa.filedistribution.FileReferenceDownload;
@@ -137,7 +138,7 @@ public class FileServerTest {
     private static class MockFileDownloader extends FileDownloader {
 
         public MockFileDownloader(File downloadDirectory) {
-            super(emptyConnectionPool(), downloadDirectory, downloadDirectory, Duration.ofMillis(100), Duration.ofMillis(100));
+            super(emptyConnectionPool(), downloadDirectory, downloadDirectory, new Downloads(), Duration.ofMillis(100), Duration.ofMillis(100));
         }
 
     }
-- 
cgit v1.2.3