diff options
Diffstat (limited to 'node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java')
-rw-r--r-- | node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java index e589ace6988..7e151a6a87e 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/HardwareBenchmarker.java @@ -4,18 +4,19 @@ package com.yahoo.vespa.hosted.node.verification.hardware; import com.yahoo.log.LogSetup; import com.yahoo.vespa.hosted.node.verification.commons.CommandExecutor; import com.yahoo.vespa.hosted.node.verification.commons.HostURLGenerator; -import com.yahoo.vespa.hosted.node.verification.commons.report.ReportSender; +import com.yahoo.vespa.hosted.node.verification.commons.report.BenchmarkReport; +import com.yahoo.vespa.hosted.node.verification.commons.report.Reporter; import com.yahoo.vespa.hosted.node.verification.hardware.benchmarks.Benchmark; import com.yahoo.vespa.hosted.node.verification.hardware.benchmarks.BenchmarkResults; import com.yahoo.vespa.hosted.node.verification.hardware.benchmarks.CPUBenchmark; import com.yahoo.vespa.hosted.node.verification.hardware.benchmarks.DiskBenchmark; import com.yahoo.vespa.hosted.node.verification.hardware.benchmarks.MemoryBenchmark; -import com.yahoo.vespa.hosted.node.verification.commons.report.BenchmarkReport; import java.io.IOException; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -26,9 +27,9 @@ public class HardwareBenchmarker { private static final Logger logger = Logger.getLogger(HardwareBenchmarker.class.getName()); - public static boolean hardwareBenchmarks(CommandExecutor commandExecutor, ArrayList<URL> nodeInfoUrls) throws IOException { + public static boolean hardwareBenchmarks(CommandExecutor commandExecutor, List<URL> nodeInfoUrls) throws IOException { BenchmarkResults benchmarkResults = new BenchmarkResults(); - ArrayList<Benchmark> benchmarks = new ArrayList<>(Arrays.asList( + List<Benchmark> benchmarks = new ArrayList<>(Arrays.asList( new DiskBenchmark(benchmarkResults, commandExecutor), new CPUBenchmark(benchmarkResults, commandExecutor), new MemoryBenchmark(benchmarkResults, commandExecutor))); @@ -36,14 +37,14 @@ public class HardwareBenchmarker { benchmark.doBenchmark(); } BenchmarkReport benchmarkReport = BenchmarkResultInspector.makeBenchmarkReport(benchmarkResults); - ReportSender.reportBenchmarkResults(benchmarkReport, nodeInfoUrls); + Reporter.reportBenchmarkResults(benchmarkReport, nodeInfoUrls); return benchmarkReport.isAllBenchmarksOK(); } public static void main(String[] args) throws IOException { LogSetup.initVespaLogging("hardware-benchmarker"); CommandExecutor commandExecutor = new CommandExecutor(); - ArrayList<URL> nodeInfoUrls; + List<URL> nodeInfoUrls; if (args.length == 0) { throw new IllegalStateException("Expected config server URL as parameter"); } |