From 527dbbbd76489ee7dc3520a1ac9cdef2646543c6 Mon Sep 17 00:00:00 2001
From: jonmv <venstad@gmail.com>
Date: Mon, 22 Jan 2024 10:33:42 +0100
Subject: Improve file downloader give-up criterion

---
 .../vespa/config/server/filedistribution/FileServerTest.java |  2 +-
 .../vespa/filedistribution/FileReferenceDownloader.java      | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

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 891284a3a0e..e0a58888109 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
@@ -206,7 +206,7 @@ public class FileServerTest {
             super(FileDownloader.emptyConnectionPool(),
                   new Supervisor(new Transport("mock")).setDropEmptyBuffers(true),
                   downloadDirectory,
-                  Duration.ofMillis(100),
+                  Duration.ofMillis(1000),
                   Duration.ofMillis(100));
         }
 
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 450801ce530..e26936cd5cf 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -67,7 +67,7 @@ public class FileReferenceDownloader {
         int retryCount = 0;
         Connection connection = connectionPool.getCurrent();
         do {
-            backoff(retryCount);
+            backoff(retryCount, end);
 
             if (FileDownloader.fileReferenceExists(fileReference, downloadDirectory))
                 return;
@@ -79,17 +79,19 @@ public class FileReferenceDownloader {
             // exist on just one config server, and which one could be different for each file reference), so
             // switch to a new connection for every retry
             connection = connectionPool.switchConnection(connection);
-        } while (retryCount < 5 || Instant.now().isAfter(end));
+        } while (Instant.now().isBefore(end));
 
         fileReferenceDownload.future().completeExceptionally(new RuntimeException("Failed getting " + fileReference));
         downloads.remove(fileReference);
     }
 
-    private void backoff(int retryCount) {
+    private void backoff(int retryCount, Instant end) {
         if (retryCount > 0) {
             try {
-                long sleepTime = Math.min(120_000, (long) (Math.pow(2, retryCount)) * sleepBetweenRetries.toMillis());
-                Thread.sleep(sleepTime);
+                long sleepTime = Math.min(120_000,
+                                          Math.min((long) (Math.pow(2, retryCount)) * sleepBetweenRetries.toMillis(),
+                                                   Duration.between(Instant.now(), end).toMillis()));
+                if (sleepTime > 0) Thread.sleep(sleepTime);
             } catch (InterruptedException e) {
                 /* ignored */
             }
-- 
cgit v1.2.3