diff options
| author | Valerij Fredriksen <valerijf@oath.com> | 2017-09-06 13:19:46 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@oath.com> | 2017-09-06 13:19:46 +0200 |
| commit | ef1cc7f7bb80c7ea95870f9057d650697c942d5c (patch) | |
| tree | 514b0701f94f7e3f70c75a0038c6735617df5f9a /node-admin | |
| parent | 93d49f767f0b26e5f680c088e7421bc732e94d15 (diff) | |
Use ten powers for disk size
Diffstat (limited to 'node-admin')
3 files changed, 5 insertions, 5 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java index cd851fab0e3..29484c08472 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java @@ -51,7 +51,7 @@ import static com.yahoo.vespa.hosted.node.admin.nodeagent.NodeAgentImpl.Containe */ public class NodeAgentImpl implements NodeAgent { // This is used as a definition of 1 GB when comparing flavor specs in node-repo - public static final long BYTES_IN_GB = 1 << 30; + private static final long BYTES_IN_GB = 1_000_000_000L; private final AtomicBoolean terminated = new AtomicBoolean(false); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java index 63f97526809..09e897e1fc2 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java @@ -109,7 +109,7 @@ public class NodeAgentImplTest { NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); when(nodeRepository.getContainerNodeSpec(hostName)).thenReturn(Optional.of(nodeSpec)); - when(storageMaintainer.getDiskUsageFor(eq(containerName))).thenReturn(Optional.of(201326592000L)); + when(storageMaintainer.getDiskUsageFor(eq(containerName))).thenReturn(Optional.of(187500000000L)); nodeAgent.converge(); @@ -553,7 +553,7 @@ public class NodeAgentImplTest { NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true); when(nodeRepository.getContainerNodeSpec(eq(hostName))).thenReturn(Optional.of(nodeSpec)); - when(storageMaintainer.getDiskUsageFor(eq(containerName))).thenReturn(Optional.of(42547019776L)); + when(storageMaintainer.getDiskUsageFor(eq(containerName))).thenReturn(Optional.of(39625000000L)); when(dockerOperations.getContainerStats(eq(containerName))) .thenReturn(Optional.of(stats1)) .thenReturn(Optional.of(stats2)); diff --git a/node-admin/src/test/resources/expected.container.system.metrics.txt b/node-admin/src/test/resources/expected.container.system.metrics.txt index d3875113d33..8a4d696b08e 100644 --- a/node-admin/src/test/resources/expected.container.system.metrics.txt +++ b/node-admin/src/test/resources/expected.container.system.metrics.txt @@ -10,11 +10,11 @@ s: "metrics": { "mem.limit": 4294967296, "mem.used": 1073741824, - "disk.used": 42547019776, + "disk.used": 39625000000, "disk.util": 15.85, "cpu.util": 5.4, "mem.util": 25.0, - "disk.limit": 268435456000 + "disk.limit": 250000000000 }, "dimensions": { "host": "host1.test.yahoo.com", |