Move execution

2 files changed, 17 insertions, 19 deletions

diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java
index 5621b932332..3e81321f92e 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionRpcServer.java
@@ -79,7 +79,7 @@ public class FileDistributionRpcServer {
     @SuppressWarnings({"UnusedDeclaration"})
     public final void getFile(Request req) {
         req.detach();
-        downloadFile(req);
+        rpcDownloadExecutor.execute(() -> downloadFile(req));
     }
 
     @SuppressWarnings({"UnusedDeclaration"})
@@ -114,24 +114,22 @@ public class FileDistributionRpcServer {
     }
 
     private void downloadFile(Request req) {
-        rpcDownloadExecutor.execute(() -> {
-            FileReference fileReference = new FileReference(req.parameters().get(0).asString());
-            log.log(LogLevel.DEBUG, "getFile() called for file reference '" + fileReference.value() + "'");
-            Optional<File> pathToFile = downloader.getFile(fileReference);
-            try {
-                if (pathToFile.isPresent()) {
-                    req.returnValues().add(new StringValue(pathToFile.get().getAbsolutePath()));
-                    log.log(LogLevel.DEBUG, "File reference '" + fileReference.value() + "' available at " + pathToFile.get());
-                } else {
-                    log.log(LogLevel.INFO, "File reference '" + fileReference.value() + "' not found, returning error");
-                    req.setError(fileReferenceDoesNotExists, "File reference '" + fileReference.value() + "' not found");
-                }
-            } catch (Throwable e) {
-                log.log(LogLevel.WARNING, "File reference '" + fileReference.value() + "' got exception: " + e.getMessage());
-                req.setError(fileReferenceInternalError, "File reference '" + fileReference.value() + "' removed");
+        FileReference fileReference = new FileReference(req.parameters().get(0).asString());
+        log.log(LogLevel.DEBUG, "getFile() called for file reference '" + fileReference.value() + "'");
+        Optional<File> pathToFile = downloader.getFile(fileReference);
+        try {
+            if (pathToFile.isPresent()) {
+                req.returnValues().add(new StringValue(pathToFile.get().getAbsolutePath()));
+                log.log(LogLevel.DEBUG, "File reference '" + fileReference.value() + "' available at " + pathToFile.get());
+            } else {
+                log.log(LogLevel.INFO, "File reference '" + fileReference.value() + "' not found, returning error");
+                req.setError(fileReferenceDoesNotExists, "File reference '" + fileReference.value() + "' not found");
             }
-            req.returnRequest();
-        });
+        } catch (Throwable e) {
+            log.log(LogLevel.WARNING, "File reference '" + fileReference.value() + "' got exception: " + e.getMessage());
+            req.setError(fileReferenceInternalError, "File reference '" + fileReference.value() + "' removed");
+        }
+        req.returnRequest();
     }
 
 }
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 20ad2e48fe2..e5ce0af0c7f 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java
@@ -118,7 +118,7 @@ public class FileReferenceDownloader {
             log.log(LogLevel.WARNING, "Request failed. Req: " + request + "\nSpec: " + connection.getAddress() +
                     ", error code: " + request.errorCode());
             if (request.isError() && request.errorCode() == ErrorCode.CONNECTION || request.errorCode() == ErrorCode.TIMEOUT) {
-                log.log(LogLevel.WARNING, "Setting error for connection " + connection.getAddress());
+                log.log(LogLevel.INFO, "Mark connection " + connection.getAddress() + " with error");
                 connectionPool.setError(connection, request.errorCode());
             }
             return false;