Update receiveFile to new signature.

2 files changed, 8 insertions, 4 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
index 581293c3128..4b0b19a34d0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
@@ -52,21 +52,25 @@ public class FileServer {
     }
 
     private void serveFile(String fileName, Target target) {
-        Request fileBlob = new Request("receiveFile");
+        Request fileBlob = new Request("filedistribution.receiveFile");
         File file = new File(getPath(new FileReference(fileName)));
         fileBlob.parameters().add(new StringValue(fileName));
+        fileBlob.parameters().add(new StringValue(fileName));
         byte [] blob = new byte [0];
         boolean success = false;
+        String errorDescription = "OK";
         try {
             blob = IOUtils.readFileBytes(file);
             success = true;
         } catch (IOException e) {
-            log.warning("Failed reading file '" + file.getAbsolutePath() + "' for sending to '" + target.toString() + "'.");
+            errorDescription = "Failed reading file '" + file.getAbsolutePath() + "'";
+            log.warning(errorDescription + "for sending to '" + target.toString() + "'.");
         }
         XXHash64 hasher = XXHashFactory.fastestInstance().hash64();
         fileBlob.parameters().add(new DataValue(blob));
-        fileBlob.parameters().add(new Int32Value(success ? 0 : 1));
         fileBlob.parameters().add(new Int64Value(hasher.hash(ByteBuffer.wrap(blob), 0)));
+        fileBlob.parameters().add(new Int32Value(success ? 0 : 1));
+        fileBlob.parameters().add(new StringValue(success ? "OK" : errorDescription));
         target.invokeSync(fileBlob, 600);
     }
 }
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 25652eb5ace..3ae6a8a1af9 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
@@ -198,7 +198,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
         getSupervisor().addMethod(new Method("printStatistics", "", "s", this, "printStatistics")
                                   .methodDesc("printStatistics")
                                   .returnDesc(0, "statistics", "Statistics for server"));
-        getSupervisor().addMethod(new Method("serveFile", "s", "is", this, "serveFile"));
+        getSupervisor().addMethod(new Method("filedistribution.serveFile", "s", "is", this, "serveFile"));
     }
 
     /**