diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-04-29 16:01:50 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-04-29 16:01:50 +0200 |
| commit | f50a21600736ab0ed01d3b7929ae52ba9ffdd864 (patch) | |
| tree | 157aa350f68eebf166dafa7b5f3e6306a5b4a58c /node-admin | |
| parent | 2cf5ee5b1fdbef0eacf61ed66624be412fcf2067 (diff) | |
Delete when we cross 80% util
Diffstat (limited to 'node-admin')
2 files changed, 4 insertions, 4 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 ef515022ae6..f1645727b7c 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 @@ -106,9 +106,9 @@ public class StorageMaintainer { public boolean cleanDiskIfFull(NodeAgentContext context) { double totalBytes = context.node().diskSize().bytes(); - // Delete enough bytes to get below 80% disk usage, but only if we are already using more than 90% disk + // Delete enough bytes to get below 70% disk usage, but only if we are already using more than 80% disk long bytesToRemove = diskUsageFor(context) - .map(diskUsage -> (long) (diskUsage.bytes() - 0.8 * totalBytes)) + .map(diskUsage -> (long) (diskUsage.bytes() - 0.7 * totalBytes)) .filter(bytes -> bytes > totalBytes * 0.1) .orElse(0L); 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 c17d0017269..3a169795df2 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 @@ -176,8 +176,8 @@ public class StorageMaintainerTest { mockDiskUsage(950_000L); storageMaintainer.cleanDiskIfFull(context); - // Allocated size: 1 GB, usage: 950_000 kiB (972.8 MB). Wanted usage: 80% => 800 MB - verify(diskCleanup).cleanup(eq(context), any(), eq(172_800_000L)); + // Allocated size: 1 GB, usage: 950_000 kiB (972.8 MB). Wanted usage: 70% => 700 MB + verify(diskCleanup).cleanup(eq(context), any(), eq(272_800_000L)); } private void mockDiskUsage(long kBytes) { |