summaryrefslogtreecommitdiffstats
path: root/node-maintainer
diff options
context:
space:
mode:
authorsindre <sindre.grostad@icloud.com>2017-08-10 11:14:02 +0200
committerOla Aunrønning <olaa@yahoo-inc.com>2017-08-15 12:29:45 +0200
commit42e01bd7f70dd7267d3ec4e1d0f2f53fa563e463 (patch)
tree7810b06847b768d635da623952d9848577ca9cf9 /node-maintainer
parent683e12217e87ce45642b245cb09a9f5faa6b4e75 (diff)
removed sudo from commands and added comment to README
Diffstat (limited to 'node-maintainer')
-rw-r--r--node-maintainer/README.md10
-rw-r--r--node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/MemoryBenchmark.java4
-rw-r--r--node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetriever.java2
3 files changed, 9 insertions, 7 deletions
diff --git a/node-maintainer/README.md b/node-maintainer/README.md
index 06b20689aaf..eb7ec53bdaf 100644
--- a/node-maintainer/README.md
+++ b/node-maintainer/README.md
@@ -12,9 +12,11 @@ Spec verification and hardware benchmarks can both be executed with and without
(if called without parameters it will use yinst to retrieve the host name):
SpecVerifier:
-- java -cp node-maintainer-jar-with-dependencies.jar com.yahoo.vespa.hosted.node.verification.spec.SpecVerifier
-- java -cp node-maintainer-jar-with-dependencies.jar com.yahoo.vespa.hosted.node.verification.spec.SpecVerifier cfg.1.hostname,cfg.2.hostname,...
+- sudo java -cp node-maintainer-jar-with-dependencies.jar com.yahoo.vespa.hosted.node.verification.spec.SpecVerifier
+- sudo java -cp node-maintainer-jar-with-dependencies.jar com.yahoo.vespa.hosted.node.verification.spec.SpecVerifier cfg.1.hostname,cfg.2.hostname,...
HardwareBenchmarker:
-- java -cp node-maintainer-jar-with-dependencies.jar com.yahoo.vespa.hosted.node.verification.hardware.HardwareBenchmarker
-- java -cp node-maintainer-jar-with-dependencies.jar com.yahoo.vespa.hosted.node.verification.hardware.HardwareBenchmarker cfg.1.hostname,cfg.2.hostname,... \ No newline at end of file
+- sudo java -cp node-maintainer-jar-with-dependencies.jar com.yahoo.vespa.hosted.node.verification.hardware.HardwareBenchmarker
+- sudo java -cp node-maintainer-jar-with-dependencies.jar com.yahoo.vespa.hosted.node.verification.hardware.HardwareBenchmarker cfg.1.hostname,cfg.2.hostname,...
+
+Both programs have README explaining closer what it does. \ No newline at end of file
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/MemoryBenchmark.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/MemoryBenchmark.java
index 07fb633f75f..8ce78d9e18d 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/MemoryBenchmark.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/benchmarks/MemoryBenchmark.java
@@ -17,8 +17,8 @@ import java.util.logging.Logger;
public class MemoryBenchmark implements Benchmark {
private static final String MEM_BENCHMARK_CREATE_FOLDER = "mkdir -p RAM_test";
- private static final String MEM_BENCHMARK_MOUNT_TMPFS = "sudo mount tmpfs -t tmpfs RAM_test/";
- private static final String MEM_BENCHMARK_UNMOUNT_TMPFS = "sudo umount RAM_test";
+ private static final String MEM_BENCHMARK_MOUNT_TMPFS = "mount tmpfs -t tmpfs RAM_test/";
+ private static final String MEM_BENCHMARK_UNMOUNT_TMPFS = "umount RAM_test";
private static final String MEM_BENCHMARK_DELETE_FOLDER = "rm -rf RAM_test";
private static final String MEM_BENCHMARK_WRITE_SPEED = "dd if=/dev/zero of=RAM_test/data_tmp bs=1M count=512";
private static final String MEM_BENCHMARK_READ_SPEED = "dd if=RAM_test/data_tmp of=/dev/null bs=1M count=512";
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetriever.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetriever.java
index 531b3af1796..346d4f3f716 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetriever.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/spec/retrievers/DiskRetriever.java
@@ -17,7 +17,7 @@ import java.util.logging.Logger;
*/
public class DiskRetriever implements HardwareRetriever {
private static final String DISK_CHECK_TYPE = "lsblk -d -o name,rota";
- private static final String DISK_CHECK_SIZE = "sudo pvdisplay --units G | grep 'PV Size'";
+ private static final String DISK_CHECK_SIZE = "pvdisplay --units G | grep 'PV Size'";
private static final String DISK_NAME = "sda";
private static final String DISK_TYPE_REGEX_SPLIT = "\\s+";
private static final int DISK_TYPE_SEARCH_ELEMENT_INDEX = 0;