Merge pull request #4413 from vespa-engine/balder/implement-chunked-send-2

Balder/implement chunked send 2

2 files changed, 1 insertions, 11 deletions

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 a09087ad8d3..72576292471 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
@@ -462,16 +462,6 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
             int session = sendMeta(fileData);
             sendParts(session, fileData);
             sendEof(session, fileData, status);
-            Request fileBlob = new Request(FileReceiver.RECEIVE_META_METHOD);
-            fileBlob.parameters().add(new StringValue(fileData.fileReference().value()));
-            fileBlob.parameters().add(new StringValue(fileData.filename()));
-            fileBlob.parameters().add(new StringValue(fileData.type().name()));
-            fileBlob.parameters().add(new Int64Value(fileData.size()));
-            target.invokeSync(fileBlob, 600);
-            if (fileBlob.isError()) {
-                log.warning("Failed delivering reference '" + fileData.fileReference().value() + "' with file '" + fileData.filename() + "' to " +
-                        target.toString() + " with error: '" + fileBlob.errorMessage() + "'.");
-            }
         }
         private void sendParts(int session, FileReferenceData fileData) {
             ByteBuffer bb = ByteBuffer.allocate(0x100000);
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
index 2df7c3a3313..73ca8de1e9c 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
@@ -71,7 +71,7 @@ public class FileReceiver {
             }
 
             try {
-                inprogressFile = Files.createTempFile(fileReferenceDir.toPath(), fileName, ".inprogress").toFile();
+                inprogressFile = Files.createTempFile(downloadDirectory.toPath(), fileName, ".inprogress").toFile();
             } catch (IOException e) {
                 String msg = "Failed creating tempfile for inprogress file for(" + fileName + ") in '" + fileReferenceDir.toPath() + "': ";
                 log.log(LogLevel.ERROR, msg + e.getMessage(), e);