Merge pull request #20535 from vespa-engine/hmusum/use-lower-timeout

Use lower timeouts in file distribution [run-systemtest]

3 files changed, 7 insertions, 12 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java b/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java
index dd4706461ad..f1fc066bce3 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/FileDistribution.java
@@ -3,7 +3,6 @@ package com.yahoo.config.model.api;
 
 import com.yahoo.config.FileReference;
 
-import java.io.File;
 import java.util.Set;
 
 /**
@@ -22,7 +21,4 @@ public interface FileDistribution {
      */
     void startDownload(String hostName, int port, Set<FileReference> fileReferences);
 
-    // TODO: Remove when 7.508 is latest version in use
-    default File getFileReferencesDir() {return null; }
-
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index 99ffff6403b..6d16520d77b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -558,7 +558,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
 
         private void invokeRpcIfValidConnection(Request request) {
             if (target.isValid()) {
-                target.invokeSync(request, 600);
+                target.invokeSync(request, 60);
             } else {
                 throw new RuntimeException("Connection to " + target + " is invalid", target.getConnectionLostReason());
             }
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 21a9833c3e0..03448b5fa4a 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -67,9 +67,9 @@ public class FileReferenceDownloader {
                 return;
 
             retryCount++;
-            // There is no one connection that will always work for each file reference (each file reference might
-            // exist on just one config server, and which one could be different for each file reference), so we
-            // should get a new connection for every retry
+            // There might not be one connection that works for all file references (each file reference might
+            // 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));
 
@@ -120,9 +120,8 @@ public class FileReferenceDownloader {
                 return false;
             }
         } else {
-            log.log(logLevel, "Downloading " + fileReference + " from " + connection.getAddress() + " failed: " +
-                    request + ", error: " + request.errorCode() + "(" + request.errorMessage() +
-                    "). Will switch config server for next request" +
+            log.log(logLevel, "Downloading " + fileReference + " from " + connection.getAddress() + " failed:" +
+                    " error code " + request.errorCode() + " (" + request.errorMessage() + ")." +
                     " (retry " + retryCount + ", rpc timeout " + rpcTimeout + ")");
             return false;
         }
@@ -136,7 +135,7 @@ public class FileReferenceDownloader {
     }
 
     private Duration rpcTimeout(int retryCount) {
-        return Duration.ofSeconds(rpcTimeout.getSeconds()).plus(Duration.ofSeconds(retryCount * 10L));
+        return Duration.ofSeconds(rpcTimeout.getSeconds()).plus(Duration.ofSeconds(retryCount * 5L));
     }
 
     private boolean validateResponse(Request request) {