summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorvalerijf <valerijf@yahoo-inc.com>2017-07-31 11:25:38 +0200
committervalerijf <valerijf@yahoo-inc.com>2017-07-31 11:25:38 +0200
commit9284f8c7810ddefa7938894776bfe134b0e5421b (patch)
tree6d8548749a9488107d6e726983a4033c47a2eb0d /node-admin
parent671d903e9efbd5963c86d3cfed2ba695be5cdfca (diff)
Rename method
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java2
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/StorageMaintainerMock.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java2
4 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 42615813e3a..e1aa706769b 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
@@ -124,7 +124,7 @@ public class StorageMaintainer {
}
}
- public Optional<Long> updateIfNeededAndGetDiskMetricsFor(ContainerName containerName) {
+ public Optional<Long> getDiskUsageFor(ContainerName containerName) {
Path containerDir = environment.pathInNodeAdminFromPathInNode(containerName, "/home/");
try {
return Optional.of(getDiscUsedInBytes(containerDir));
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 4416c412d61..6ee827d8db8 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
@@ -527,7 +527,7 @@ public class NodeAgentImpl implements NodeAgent {
final long memoryTotalBytesCache = ((Number) ((Map) stats.getMemoryStats().get("stats")).get("cache")).longValue();
final Optional<Long> diskTotalBytes = nodeSpec.minDiskAvailableGb.map(size -> (long) (size * bytesInGB));
final Optional<Long> diskTotalBytesUsed = storageMaintainer.flatMap(maintainer -> maintainer
- .updateIfNeededAndGetDiskMetricsFor(containerName));
+ .getDiskUsageFor(containerName));
// CPU usage by a container as percentage of total host CPU, cpuPercentageOfHost, is given by dividing used
// CPU time by the container with CPU time used by the entire system.
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 8e6a5a482e9..04dc4010d8a 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
@@ -24,7 +24,7 @@ public class StorageMaintainerMock extends StorageMaintainer {
}
@Override
- public Optional<Long> updateIfNeededAndGetDiskMetricsFor(ContainerName containerName) {
+ public Optional<Long> getDiskUsageFor(ContainerName containerName) {
return Optional.empty();
}
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 9bc8f4fadc1..cc54961ee59 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
@@ -524,7 +524,7 @@ public class NodeAgentImplTest {
NodeAgentImpl nodeAgent = makeNodeAgent(dockerImage, true);
when(nodeRepository.getContainerNodeSpec(eq(hostName))).thenReturn(Optional.of(nodeSpec));
- when(storageMaintainer.updateIfNeededAndGetDiskMetricsFor(eq(containerName))).thenReturn(Optional.of(42547019776L));
+ when(storageMaintainer.getDiskUsageFor(eq(containerName))).thenReturn(Optional.of(42547019776L));
when(storageMaintainer.getHostTotalMemoryGb()).thenReturn(10d);
when(dockerOperations.getContainerStats(eq(containerName)))
.thenReturn(Optional.of(stats1))