diff options
author | valerijf <valerijf@yahoo-inc.com> | 2017-05-30 12:59:37 +0200 |
---|---|---|
committer | valerijf <valerijf@yahoo-inc.com> | 2017-05-30 12:59:37 +0200 |
commit | 38a526adc2894cbe43318d46201862430d4628c6 (patch) | |
tree | 0467ab939d8d7c4e86669c9629190d2cdb870f30 /node-admin | |
parent | 8d169aac6d85f002f70fedb788fae34566d0bf0e (diff) |
Clean filedistribution inside node-admin container
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java | 23 |
1 files changed, 13 insertions, 10 deletions
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 10066567018..4df6ab52325 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 @@ -205,7 +205,7 @@ public class StorageMaintainer { maintainerExecutor.addJob("delete-files") .withArgument("basePath", fileDistrDir) .withArgument("maxAgeSeconds", Duration.ofDays(31).getSeconds()) - .withArgument("recursive", false); + .withArgument("recursive", true); maintainerExecutor.execute(); getMaintenanceThrottlerFor(containerName).updateNextRemoveOldFilesTime(); @@ -250,7 +250,8 @@ public class StorageMaintainer { /** * Deletes old * * archived app data - * * JDisc logs + * * Vespa logs + * * Filedistribution files */ public void cleanNodeAdmin() { if (! getMaintenanceThrottlerFor(NODE_ADMIN).shouldRemoveOldFilesNow()) return; @@ -261,12 +262,18 @@ public class StorageMaintainer { .withArgument("maxAgeSeconds", Duration.ofDays(7).getSeconds()) .withArgument("dirNameRegex", "^" + Pattern.quote(Environment.APPLICATION_STORAGE_CLEANUP_PATH_PREFIX)); - Path nodeAdminJDiskLogsPath = environment.pathInNodeAdminFromPathInNode(NODE_ADMIN, "/home/y/logs/jdisc_core/"); + Path nodeAdminJDiskLogsPath = environment.pathInNodeAdminFromPathInNode(NODE_ADMIN, "/home/y/logs/vespa/"); maintainerExecutor.addJob("delete-files") .withArgument("basePath", nodeAdminJDiskLogsPath) .withArgument("maxAgeSeconds", Duration.ofDays(31).getSeconds()) .withArgument("recursive", false); + Path fileDistrDir = environment.pathInNodeAdminFromPathInNode(NODE_ADMIN, "/home/y/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(); } @@ -323,11 +330,7 @@ public class StorageMaintainer { return job; } - ProcessResult execute() { - String classPath = String.join(":", - "/home/y/lib/jars/node-maintainer-jar-with-dependencies.jar", - "/home/y/lib/jars/vespajlib.jar"); - + void execute() { String args; try { args = objectMapper.writeValueAsString(jobs); @@ -335,7 +338,8 @@ public class StorageMaintainer { throw new RuntimeException("Failed transform list of maintenance jobs to JSON"); } - String[] command = {"java", "-cp", classPath, + String[] command = {"java", + "-cp", "/home/y/lib/jars/node-maintainer-jar-with-dependencies.jar", "-Dvespa.log.target=file:" + getDefaults().underVespaHome("logs/vespa/maintainer.log"), "com.yahoo.vespa.hosted.node.maintainer.Maintainer", args}; ProcessResult result = docker.executeInContainerAsRoot(executeIn, command); @@ -344,7 +348,6 @@ public class StorageMaintainer { numberOfNodeAdminMaintenanceFails.add(); throw new RuntimeException("Failed to run maintenance jobs: " + args + result); } - return result; } } |