diff options
author | Harald Musum <musum@yahooinc.com> | 2024-06-05 19:32:13 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2024-06-05 19:32:13 +0200 |
commit | 8d66a8da7de9411a0a087bc0828065b46918ad0f (patch) | |
tree | b37bb59563b378371adae87bb13b7ac20cea8c49 | |
parent | d40bdea2158bf51a45316799d26202a75e98e05b (diff) |
Revert "Revert "Revert "Preprocess application package in temp dir, then move atomically to d…"""
This reverts commit 05d5e101a0fd5da0db7972e7e227c6edc7ea68e5.
-rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java | 35 |
1 files changed, 10 insertions, 25 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 df62f762c40..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 @@ -52,7 +52,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; import java.io.StringReader; -import java.nio.file.AccessDeniedException; import java.nio.file.Files; import java.security.MessageDigest; import java.util.ArrayList; @@ -614,38 +613,24 @@ public class FilesApplicationPackage extends AbstractApplicationPackage { @Override public ApplicationPackage preprocess(Zone zone, DeployLogger logger) throws IOException { - try { - java.nio.file.Path tempDir = Files.createTempDirectory(appDir.getParentFile().toPath(), "preprocess-tempdir"); - preprocess(appDir, tempDir.toFile(), zone); - IOUtils.recursiveDeleteDir(preprocessedDir); - // Use 'move' to make sure we do this atomically, important to avoid writing only partial content e.g. - // when shutting down. - // Temp directory needs to be on the same file system as appDir for 'move' to work, - // if it fails (with DirectoryNotEmptyException (!)) we need to use 'copy' instead - // (this will always be the case for the application package for a standalone container). - Files.move(tempDir, preprocessedDir.toPath()); - } catch (AccessDeniedException e) { - preprocess(appDir, preprocessedDir, zone); - } - FilesApplicationPackage preprocessedApp = fromFile(preprocessedDir, includeSourceFiles); - preprocessedApp.copyUserDefsIntoApplication(); - return preprocessedApp; - } - - private void preprocess(File appDir, File dir, Zone zone) throws IOException { - validateServicesFile(); - IOUtils.copyDirectory(appDir, dir, - 1, + IOUtils.recursiveDeleteDir(preprocessedDir); + IOUtils.copyDirectory(appDir, preprocessedDir, -1, (__, name) -> ! List.of(preprocessed, SERVICES, HOSTS, CONFIG_DEFINITIONS_DIR).contains(name)); - preprocessXML(applicationFile(dir, SERVICES), getServicesFile(), zone); - preprocessXML(applicationFile(dir, HOSTS), getHostsFile(), zone); + File servicesFile = validateServicesFile(); + preprocessXML(applicationFile(preprocessedDir, SERVICES), servicesFile, zone); + preprocessXML(applicationFile(preprocessedDir, HOSTS), getHostsFile(), zone); + FilesApplicationPackage preprocessed = fromFile(preprocessedDir, includeSourceFiles); + preprocessed.copyUserDefsIntoApplication(); + return preprocessed; } - private void validateServicesFile() throws IOException { + private File validateServicesFile() throws IOException { File servicesFile = getServicesFile(); if ( ! servicesFile.exists()) throw new IllegalArgumentException(SERVICES + " does not exist in application package"); if (IOUtils.readFile(servicesFile).isEmpty()) throw new IllegalArgumentException(SERVICES + " in application package is empty"); + return servicesFile; } private void copyUserDefsIntoApplication() { |