Log time it takes to download image

3 files changed, 11 insertions, 3 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperations.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperations.java
index 1ee7bfebc21..fa933e9622a 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperations.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/ContainerOperations.java
@@ -36,7 +36,7 @@ public class ContainerOperations {
 
     public ContainerOperations(ContainerEngine containerEngine, Cgroup cgroup, FileSystem fileSystem, Timer timer) {
         this.containerEngine = Objects.requireNonNull(containerEngine);
-        this.imageDownloader = new ContainerImageDownloader(containerEngine);
+        this.imageDownloader = new ContainerImageDownloader(containerEngine, timer);
         this.imagePruner = new ContainerImagePruner(containerEngine, timer);
         this.containerStatsCollector = new ContainerStatsCollector(containerEngine, cgroup, fileSystem);
     }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/image/ContainerImageDownloader.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/image/ContainerImageDownloader.java
index c37cdbe80c0..d3327bf5148 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/image/ContainerImageDownloader.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/container/image/ContainerImageDownloader.java
@@ -3,10 +3,13 @@ package com.yahoo.vespa.hosted.node.admin.container.image;
 
 import com.yahoo.concurrent.DaemonThreadFactory;
 import com.yahoo.config.provision.DockerImage;
+import com.yahoo.jdisc.Timer;
 import com.yahoo.vespa.hosted.node.admin.component.TaskContext;
 import com.yahoo.vespa.hosted.node.admin.container.ContainerEngine;
 import com.yahoo.vespa.hosted.node.admin.container.RegistryCredentialsProvider;
 
+import java.time.Duration;
+import java.time.Instant;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Objects;
@@ -26,13 +29,15 @@ public class ContainerImageDownloader {
     private static final Logger LOG = Logger.getLogger(ContainerImageDownloader.class.getName());
 
     private final ContainerEngine containerEngine;
+    private final Timer timer;
 
     private final ExecutorService executorService = Executors.newSingleThreadExecutor(
             new DaemonThreadFactory("container-image-downloader")); // Download one image at a time
     private final Set<DockerImage> pendingDownloads = Collections.synchronizedSet(new HashSet<>());
 
-    public ContainerImageDownloader(ContainerEngine containerEngine) {
+    public ContainerImageDownloader(ContainerEngine containerEngine, Timer timer) {
         this.containerEngine = Objects.requireNonNull(containerEngine);
+        this.timer = Objects.requireNonNull(timer);
     }
 
     /**
@@ -45,7 +50,9 @@ public class ContainerImageDownloader {
         if (containerEngine.hasImage(context, image)) return true;
         executorService.submit(() -> {
             try {
+                Instant start = timer.currentTime();
                 containerEngine.pullImage(context, image, credentialsProvider.get());
+                LOG.log(Level.INFO, "Downloaded container image " + image + " in " + Duration.between(start, timer.currentTime()));
             } catch (RuntimeException e) {
                 LOG.log(Level.SEVERE, "Failed to download container image " + image, e);
             } finally {
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/image/ContainerImageDownloaderTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/image/ContainerImageDownloaderTest.java
index a25bab02121..7f002eee315 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/image/ContainerImageDownloaderTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/image/ContainerImageDownloaderTest.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.hosted.node.admin.container.image;
 
 import com.yahoo.config.provision.DockerImage;
+import com.yahoo.jdisc.test.TestTimer;
 import com.yahoo.vespa.hosted.node.admin.component.TaskContext;
 import com.yahoo.vespa.hosted.node.admin.component.TestTaskContext;
 import com.yahoo.vespa.hosted.node.admin.container.ContainerEngineMock;
@@ -21,7 +22,7 @@ public class ContainerImageDownloaderTest {
     @Timeout(5_000)
     void test_download() {
         ContainerEngineMock podman = new ContainerEngineMock().asyncImageDownload(true);
-        ContainerImageDownloader downloader = new ContainerImageDownloader(podman);
+        ContainerImageDownloader downloader = new ContainerImageDownloader(podman, new TestTimer());
         TaskContext context = new TestTaskContext();
         DockerImage image = DockerImage.fromString("registry.example.com/repo/vespa:7.42");