diff options
author | bjormel <bjormel@verizonmedia.com> | 2022-12-18 14:48:54 +0100 |
---|---|---|
committer | bjormel <bjormel@verizonmedia.com> | 2022-12-18 14:48:54 +0100 |
commit | a4aa15d295fe19fe488723eae33926ce9ae18c62 (patch) | |
tree | f0df52746bee6746bc5256b23912f1cd59ab23d9 /node-admin | |
parent | b36fdededf2cb62c5be8814f4d6bf4038dc86dfc (diff) |
Clean up /opt/vespa/var/tmp in container
Diffstat (limited to 'node-admin')
2 files changed, 8 insertions, 2 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 b2b587490ca..efe03e5704b 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 @@ -151,10 +151,12 @@ public class StorageMaintainer { rules.add(CoredumpCleanupRule.forContainer(context.paths().underVespaHome("var/crash"))); - if (context.node().membership().map(m -> m.type().hasContainer()).orElse(false)) + if (context.node().membership().map(m -> m.type().hasContainer()).orElse(false)) { rules.add(new LinearCleanupRule(() -> FileFinder.files(context.paths().underVespaHome("logs/vespa/access")).list(), fa -> monthNormalizer.apply(fa.lastModifiedTime()), Priority.LOWEST, Priority.HIGHEST)); - + rules.add(new LinearCleanupRule(() -> FileFinder.files(context.paths().underVespaHome("var/tmp")).list(), + fa -> monthNormalizer.apply(fa.lastModifiedTime()), Priority.LOWEST, Priority.HIGHEST)); + } if (context.nodeType() == NodeType.tenant && context.node().membership().map(m -> m.type().isAdmin()).orElse(false)) rules.add(new LinearCleanupRule(() -> FileFinder.files(context.paths().underVespaHome("logs/vespa/logarchive")).list(), fa -> monthNormalizer.apply(fa.lastModifiedTime()), Priority.LOWEST, Priority.HIGHEST)); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java index 6db0bf0c730..65b62848d4b 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java @@ -126,6 +126,9 @@ public class StorageMaintainerTest { Files.createDirectories(containerVespaHome.resolve("var/db")); Files.createFile(containerVespaHome.resolve("var/db/some-file")); + Files.createDirectories(containerVespaHome.resolve("var/tmp")); + Files.createFile(containerVespaHome.resolve("var/tmp/some-file")); + ContainerPath containerRoot = context.paths().of("/"); Set<String> actualContents = FileFinder.files(containerRoot) .stream() @@ -135,6 +138,7 @@ public class StorageMaintainerTest { "etc/something/conf", "opt/vespa/logs/vespa/vespa.log", "opt/vespa/logs/vespa/zookeeper.log", + "opt/vespa/var/tmp/some-file", "opt/vespa/var/db/some-file"); assertEquals(expectedContents, actualContents); return context; |