Revert "Preprocess application package in temp dir, then move atomically to d…"

1 files changed, 5 insertions, 11 deletions

diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
index 4cc465e5e71..28bf8e10a93 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
@@ -32,7 +32,6 @@ import com.yahoo.vespa.config.ConfigDefinition;
 import com.yahoo.vespa.config.ConfigDefinitionBuilder;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
 import com.yahoo.vespa.config.util.ConfigUtils;
-import com.yahoo.vespa.defaults.Defaults;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -54,7 +53,6 @@ import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
 import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -615,16 +613,12 @@ public class FilesApplicationPackage extends AbstractApplicationPackage {
 
     @Override
     public ApplicationPackage preprocess(Zone zone, DeployLogger logger) throws IOException {
-        var tmpDirBase = Paths.get(System.getProperty("java.io.tmpdir", Defaults.getDefaults().underVespaHome("tmp")));
-        var tempDir = Files.createTempDirectory(tmpDirBase, "preprocess-tempdir").toFile();
-
-        File servicesFile = validateServicesFile();
-        IOUtils.copyDirectory(appDir, tempDir, -1,
+        IOUtils.recursiveDeleteDir(preprocessedDir);
+        IOUtils.copyDirectory(appDir, preprocessedDir, -1,
                               (__, name) -> ! List.of(preprocessed, SERVICES, HOSTS, CONFIG_DEFINITIONS_DIR).contains(name));
-        preprocessXML(applicationFile(tempDir, SERVICES), servicesFile, zone);
-        preprocessXML(applicationFile(tempDir, HOSTS), getHostsFile(), zone);
-        IOUtils.recursiveDeleteDir(preprocessedDir); // Make sure dir does not exist, needed for move to work
-        Files.move(tempDir.toPath(), preprocessedDir.toPath());
+        File servicesFile = validateServicesFile();
+        preprocessXML(applicationFile(preprocessedDir, SERVICES), servicesFile, zone);
+        preprocessXML(applicationFile(preprocessedDir, HOSTS), getHostsFile(), zone);
         FilesApplicationPackage preprocessed = fromFile(preprocessedDir, includeSourceFiles);
         preprocessed.copyUserDefsIntoApplication();
         return preprocessed;