From 699f3d561d29780f1ba545d1a8ad7df766fea1a2 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@oath.com>
Date: Wed, 7 Feb 2018 13:12:20 +0100
Subject: Delete inprogress file

---
 .../src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java     | 1 +
 1 file changed, 1 insertion(+)

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 3d6c7bf0a5c..a43fb74554a 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
@@ -115,6 +115,7 @@ public class FileReceiver {
                     File decompressedDir = Files.createTempDirectory(tmpDir.toPath(), "archive").toFile();
                     log.log(LogLevel.DEBUG, "Archived file, unpacking " + inprogressFile + " to " + decompressedDir);
                     CompressedFileReference.decompress(inprogressFile, decompressedDir);
+                    Files.delete(inprogressFile.toPath());
                     moveFileToDestination(decompressedDir, fileReferenceDir);
                 } else {
                     try {
-- 
cgit v1.2.3


From dc9146397a91a7ced8502e2559df4619747c1bea Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@oath.com>
Date: Wed, 7 Feb 2018 14:44:23 +0100
Subject: Delete inprogress file in a finally clause

---
 .../main/java/com/yahoo/vespa/filedistribution/FileReceiver.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 a43fb74554a..c95fe73ab4e 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
@@ -115,7 +115,6 @@ public class FileReceiver {
                     File decompressedDir = Files.createTempDirectory(tmpDir.toPath(), "archive").toFile();
                     log.log(LogLevel.DEBUG, "Archived file, unpacking " + inprogressFile + " to " + decompressedDir);
                     CompressedFileReference.decompress(inprogressFile, decompressedDir);
-                    Files.delete(inprogressFile.toPath());
                     moveFileToDestination(decompressedDir, fileReferenceDir);
                 } else {
                     try {
@@ -130,6 +129,12 @@ public class FileReceiver {
             } catch (IOException e) {
                 log.log(LogLevel.ERROR, "Failed writing file: " + e.getMessage(), e);
                 throw new RuntimeException("Failed writing file: ", e);
+            } finally {
+                try {
+                    Files.delete(inprogressFile.toPath());
+                } catch (IOException e) {
+                    log.log(LogLevel.ERROR, "Failed deleting " + inprogressFile.getAbsolutePath() + ": " + e.getMessage(), e);
+                }
             }
             return file;
         }
-- 
cgit v1.2.3