summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2017-11-27 08:18:06 +0100
committerHarald Musum <musum@oath.com>2017-11-27 08:18:06 +0100
commit0e958dd5517cdee3fd22de4e0a6ce167055bad79 (patch)
tree8bf36ede0724ae09ca5d20582c52862a36ceaf23 /node-admin
parent7e8f8da8f249cf3c529cec8ecdcf13b69c99da13 (diff)
Add setting for turning off file distributor
If set, will not start file distributor on config server host and on tenant nodes, will instead use config proxy and file distribution will be done with RPC calls between config proxy and config server
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java2
1 files changed, 1 insertions, 1 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 a3a647e1d14..763291bf86b 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
@@ -139,7 +139,7 @@ public class StorageMaintainer {
Process duCommand = new ProcessBuilder().command(command).start();
if (!duCommand.waitFor(60, TimeUnit.SECONDS)) {
duCommand.destroy();
- throw new RuntimeException("Disk usage command timedout, aborting.");
+ throw new RuntimeException("Disk usage command timed out, aborting.");
}
String output = IOUtils.readAll(new InputStreamReader(duCommand.getInputStream()));
String[] results = output.split("\t");