Move to archive dir

4 files changed, 11 insertions, 45 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java
index 1f02762669f..c46bc2ce11f 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/Environment.java
@@ -147,8 +147,8 @@ public class Environment {
      */
     public Path pathInNodeAdminToNodeCleanup(ContainerName containerName) {
         return pathResolver.getApplicationStoragePathForNodeAdmin()
-                .resolve(APPLICATION_STORAGE_CLEANUP_PATH_PREFIX + containerName.asString() +
-                        "_" + filenameFormatter.format(Instant.now()));
+                .resolve("archive")
+                .resolve(containerName.asString() + "_" + filenameFormatter.format(Instant.now()));
     }
 
     /**
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
index 21c222d7e60..28327acb7c9 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
@@ -38,7 +38,6 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
-import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 import static com.yahoo.vespa.defaults.Defaults.getDefaults;
@@ -47,7 +46,6 @@ import static com.yahoo.vespa.defaults.Defaults.getDefaults;
  * @author freva
  */
 public class StorageMaintainer {
-    private static final ContainerName NODE_ADMIN = new ContainerName("node-admin");
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
     private final DockerOperations dockerOperations;
@@ -65,7 +63,7 @@ public class StorageMaintainer {
     }
 
     public StorageMaintainer(DockerOperations dockerOperations, ProcessExecuter processExecuter,
-                             Environment environment, CoredumpHandler coredumpHandler) {
+                             Environment environment, CoredumpHandler coredumpHandler, Path pathToContainerArchive) {
         this(dockerOperations, processExecuter, environment, coredumpHandler, Clock.systemUTC());
     }
 
@@ -328,39 +326,6 @@ public class StorageMaintainer {
     }
 
     /**
-     * Deletes old
-     *  * archived app data
-     *  * Vespa logs
-     *  * Filedistribution files
-     */
-    public void cleanNodeAdmin() {
-        if (! getMaintenanceThrottlerFor(NODE_ADMIN).shouldRemoveOldFilesNow()) return;
-
-        MaintainerExecutor maintainerExecutor = new MaintainerExecutor();
-        maintainerExecutor.addJob("delete-directories")
-                .withArgument("basePath", environment.getPathResolver().getApplicationStoragePathForNodeAdmin())
-                .withArgument("maxAgeSeconds", Duration.ofDays(7).getSeconds())
-                .withArgument("dirNameRegex", "^" + Pattern.quote(Environment.APPLICATION_STORAGE_CLEANUP_PATH_PREFIX));
-
-        Path nodeAdminJDiskLogsPath = environment.pathInNodeAdminFromPathInNode(
-                NODE_ADMIN, environment.pathInNodeUnderVespaHome("logs/vespa/"));
-        maintainerExecutor.addJob("delete-files")
-                .withArgument("basePath", nodeAdminJDiskLogsPath)
-                .withArgument("maxAgeSeconds", Duration.ofDays(31).getSeconds())
-                .withArgument("recursive", false);
-
-        Path fileDistrDir = environment.pathInNodeAdminFromPathInNode(
-                NODE_ADMIN, environment.pathInNodeUnderVespaHome("var/db/vespa/filedistribution"));
-        maintainerExecutor.addJob("delete-files")
-                .withArgument("basePath", fileDistrDir)
-                .withArgument("maxAgeSeconds", Duration.ofDays(31).getSeconds())
-                .withArgument("recursive", true);
-
-        maintainerExecutor.execute();
-        getMaintenanceThrottlerFor(NODE_ADMIN).updateNextRemoveOldFilesTime();
-    }
-
-    /**
      * Prepares the container-storage for the next container by deleting/archiving all the data of the current container.
      * Removes old files, reports coredumps and archives container data, runs when container enters state "dirty"
      */
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
index 2621156487d..c00c4cb7717 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
@@ -42,7 +42,6 @@ public class NodeAdminImpl implements NodeAdmin {
 
     private final DockerOperations dockerOperations;
     private final Function<String, NodeAgent> nodeAgentFactory;
-    private final StorageMaintainer storageMaintainer;
     private final Runnable aclMaintainer;
 
     private final Clock clock;
@@ -61,9 +60,16 @@ public class NodeAdminImpl implements NodeAdmin {
                          Runnable aclMaintainer,
                          MetricReceiverWrapper metricReceiver,
                          Clock clock) {
+        this(dockerOperations, nodeAgentFactory, aclMaintainer, metricReceiver, clock);
+    }
+
+    public NodeAdminImpl(DockerOperations dockerOperations,
+                         Function<String, NodeAgent> nodeAgentFactory,
+                         Runnable aclMaintainer,
+                         MetricReceiverWrapper metricReceiver,
+                         Clock clock) {
         this.dockerOperations = dockerOperations;
         this.nodeAgentFactory = nodeAgentFactory;
-        this.storageMaintainer = storageMaintainer;
         this.aclMaintainer = aclMaintainer;
 
         this.clock = clock;
@@ -82,7 +88,6 @@ public class NodeAdminImpl implements NodeAdmin {
                 .map(NodeSpec::getHostname)
                 .collect(Collectors.toSet());
 
-        storageMaintainer.cleanNodeAdmin();
         synchronizeNodesToNodeAgents(hostnamesOfContainersToRun);
 
         updateNodeAgentMetrics();
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/StorageMaintainerMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/StorageMaintainerMock.java
index 3bd380a73a2..9ba0984c93d 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/StorageMaintainerMock.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/StorageMaintainerMock.java
@@ -39,10 +39,6 @@ public class StorageMaintainerMock extends StorageMaintainer {
     }
 
     @Override
-    public void cleanNodeAdmin() {
-    }
-
-    @Override
     public void cleanupNodeStorage(ContainerName containerName, NodeSpec node) {
         callOrderVerifier.add("DeleteContainerStorage with " + containerName);
     }