Revert "Do RPC call asynchronously and with higher timeout "

1 files changed, 7 insertions, 8 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java
index be82d3950a5..36d76bbfc79 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDistributionImpl.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.config.server.filedistribution;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.FileReference;
 import com.yahoo.config.model.api.FileDistribution;
+import com.yahoo.jrt.ErrorCode;
 import com.yahoo.jrt.Request;
 import com.yahoo.jrt.Spec;
 import com.yahoo.jrt.StringArray;
@@ -44,16 +45,14 @@ public class FileDistributionImpl implements FileDistribution {
     // as downloading will then start synchronously when a service requests a file reference instead
     private void startDownloadingFileReferences(String hostName, int port, Set<FileReference> fileReferences) {
         Target target = supervisor.connect(new Spec(hostName, port));
-        double timeout = 0.5;
+        double timeout = 0.1;
         Request request = new Request("filedistribution.setFileReferencesToDownload");
         request.parameters().add(new StringArray(fileReferences.stream().map(FileReference::value).toArray(String[]::new)));
         log.log(LogLevel.DEBUG, "Executing " + request.methodName() + " against " + target.toString());
-        target.invokeAsync(request, timeout, (req) -> {
-            if (req.isError()) {
-                log.log(LogLevel.DEBUG, req.methodName() + " failed: " + req.errorCode() + " (" + req.errorMessage() + ")");
-            }
-            req.target().close();
-        });
+        target.invokeSync(request, timeout);
+        if (request.isError() && request.errorCode() != ErrorCode.CONNECTION) {
+            log.log(LogLevel.DEBUG, request.methodName() + " failed: " + request.errorCode() + " (" + request.errorMessage() + ")");
+        }
+        target.close();
     }
-
 }