Merge pull request #11695 from vespa-engine/hmusum/delete-filedistribution-destination-before-move

Delete destination dir before moving files

1 files changed, 3 insertions, 0 deletions

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 c4487252e27..4089f800913 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
@@ -111,6 +111,9 @@ public class FileReceiver {
             }
             File file = new File(fileReferenceDir, fileName);
             try {
+                // Delete destination dir, in case a previous attempt at writing to disk failed and the directory
+                // exists, but has no or incomplete content
+                deleteFileOrDirectory(fileReferenceDir);
                 // Unpack if necessary
                 if (fileType == FileReferenceData.Type.compressed) {
                     File decompressedDir = Files.createTempDirectory(tmpDir.toPath(), "archive").toFile();