summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorvalerijf <valerijf@yahoo-inc.com>2017-07-31 12:49:25 +0200
committervalerijf <valerijf@yahoo-inc.com>2017-07-31 12:49:25 +0200
commit93fc424035ae8f2050aa3b9e71e4e41f76354b29 (patch)
tree8b5a90a2a69b0197cc0dd22d9c79fac728d90306 /node-admin
parent9284f8c7810ddefa7938894776bfe134b0e5421b (diff)
Renamed submethod
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java4
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainerTest.java2
2 files changed, 3 insertions, 3 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 e1aa706769b..6aecd0813b4 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
@@ -127,7 +127,7 @@ public class StorageMaintainer {
public Optional<Long> getDiskUsageFor(ContainerName containerName) {
Path containerDir = environment.pathInNodeAdminFromPathInNode(containerName, "/home/");
try {
- return Optional.of(getDiscUsedInBytes(containerDir));
+ return Optional.of(getDiskUsedInBytes(containerDir));
} catch (Throwable e) {
PrefixLogger logger = PrefixLogger.getNodeAgentLogger(StorageMaintainer.class, containerName);
logger.error("Problems during disk usage calculations in " + containerDir.toAbsolutePath(), e);
@@ -136,7 +136,7 @@ public class StorageMaintainer {
}
// Public for testing
- long getDiscUsedInBytes(Path path) throws IOException, InterruptedException {
+ long getDiskUsedInBytes(Path path) throws IOException, InterruptedException {
final String[] command = {"du", "-xsk", path.toString()};
Process duCommand = new ProcessBuilder().command(command).start();
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 74f09d36e9d..9fa43752157 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
@@ -48,7 +48,7 @@ public class StorageMaintainerTest {
int writeSize = 10000;
writeNBytesToFile(folder.newFile(), writeSize);
- long usedBytes = storageMaintainer.getDiscUsedInBytes(folder.getRoot().toPath());
+ long usedBytes = storageMaintainer.getDiskUsedInBytes(folder.getRoot().toPath());
if (usedBytes * 4 < writeSize || usedBytes > writeSize * 4)
fail("Used bytes is " + usedBytes + ", but wrote " + writeSize + " bytes, not even close.");
}