Changed reporting of benchmarks

4 files changed, 24 insertions, 20 deletions

diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/BenchmarkResultInspector.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/BenchmarkResultInspector.java
index d5174549b9d..1431b233d8f 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/BenchmarkResultInspector.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/BenchmarkResultInspector.java
@@ -3,6 +3,9 @@ package com.yahoo.vespa.hosted.node.verification.hardware;
 import com.yahoo.vespa.hosted.node.verification.hardware.benchmarks.BenchmarkResults;
 import com.yahoo.vespa.hosted.node.verification.hardware.report.BenchmarkReport;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 public class BenchmarkResultInspector {
 
     private static final double CPU_FREQUENCY_LOWER_LIMIT = 0.5;
@@ -10,18 +13,18 @@ public class BenchmarkResultInspector {
     private static final double MEMORY_READ_SPEED_LOWER_LIMIT = 1D;
     private static final double DISK_SPEED_LOWER_LIMIT = 50D;
 
-    public static BenchmarkReport makeBenchmarkReport(BenchmarkResults benchmarkResults) {
+    public static BenchmarkReport isBenchmarkResultsValid(BenchmarkResults benchmarkResults) {
         BenchmarkReport benchmarkReport = new BenchmarkReport();
         double cpuCyclesPerSec = benchmarkResults.getCpuCyclesPerSec();
-        if (cpuCyclesPerSec < CPU_FREQUENCY_LOWER_LIMIT) {
+        if ( cpuCyclesPerSec < CPU_FREQUENCY_LOWER_LIMIT) {
             benchmarkReport.setCpuCyclesPerSec(cpuCyclesPerSec);
         }
         double memoryWriteSpeed = benchmarkResults.getMemoryWriteSpeedGBs();
-        if (memoryWriteSpeed < MEMORY_WRITE_SPEED_LOWER_LIMIT) {
+        if ( memoryWriteSpeed < MEMORY_WRITE_SPEED_LOWER_LIMIT) {
             benchmarkReport.setMemoryWriteSpeedGBs(memoryWriteSpeed);
         }
         double memoryReadSpeed = benchmarkResults.getMemoryReadSpeedGBs();
-        if (memoryReadSpeed < MEMORY_READ_SPEED_LOWER_LIMIT) {
+        if ( memoryReadSpeed < MEMORY_READ_SPEED_LOWER_LIMIT) {
             benchmarkReport.setMemoryReadSpeedGBs(memoryReadSpeed);
         }
         double diskSpeed = benchmarkResults.getDiskSpeedMbs();
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 5bd407ae0fd..7798892f97f 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
@@ -27,20 +27,15 @@ public class HardwareBenchmarker {
         for (Benchmark benchmark : benchmarks) {
             benchmark.doBenchmark();
         }
-        BenchmarkReport benchmarkReport = BenchmarkResultInspector.makeBenchmarkReport(benchmarkResults);
+        BenchmarkReport benchmarkReport = makeBenchmarkReport(benchmarkResults);
         printBenchmarkResults(benchmarkReport);
-        return isAllBenchmarksOK(benchmarkReport);
+
+        return true;
     }
 
-    private static boolean isAllBenchmarksOK(BenchmarkReport benchmarkReport) {
-        ObjectMapper om = new ObjectMapper();
-        try {
-            String jsonReport = om.writeValueAsString(benchmarkReport);
-            return jsonReport.length() == 2;
-        } catch (JsonProcessingException e){
-            e.printStackTrace();
-            return false;
-        }
+    protected static BenchmarkReport makeBenchmarkReport(BenchmarkResults benchmarkResults) {
+        BenchmarkReport benchmarkReport = BenchmarkResultInspector.isBenchmarkResultsValid(benchmarkResults);
+        return benchmarkReport;
     }
 
     private static void printBenchmarkResults(BenchmarkReport benchmarkReport) {
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/report/BenchmarkReport.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/report/BenchmarkReport.java
index e1b8cd9bb8c..28f2581aa0b 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/report/BenchmarkReport.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/hardware/report/BenchmarkReport.java
@@ -1,7 +1,13 @@
 package com.yahoo.vespa.hosted.node.verification.hardware.report;
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yahoo.vespa.hosted.node.verification.hardware.benchmarks.BenchmarkResults;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created by sgrostad on 12/07/2017.
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/hardware/BenchmarkResultInspectorTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/hardware/BenchmarkResultInspectorTest.java
index 55f5af05771..545524b467d 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/hardware/BenchmarkResultInspectorTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/hardware/BenchmarkResultInspectorTest.java
@@ -35,7 +35,7 @@ public class BenchmarkResultInspectorTest {
 
     @Test
     public void isBenchmarkResultsValid_should_return_BenchmarkReport_with_all_values_null() {
-        BenchmarkReport benchmarkReport = BenchmarkResultInspector.makeBenchmarkReport(benchmarkResults);
+        BenchmarkReport benchmarkReport = BenchmarkResultInspector.isBenchmarkResultsValid(benchmarkResults);
         assertNull(benchmarkReport.getCpuCyclesPerSec());
         assertNull(benchmarkReport.getDiskSpeedMbs());
         assertNull(benchmarkReport.getMemoryReadSpeedGBs());
@@ -45,7 +45,7 @@ public class BenchmarkResultInspectorTest {
     @Test
     public void isBenchmarkResultsValid_should_only_set_cpu_frequency() {
         benchmarkResults.setCpuCyclesPerSec(INVALID_CPU_FREQUENCY);
-        BenchmarkReport benchmarkReport = BenchmarkResultInspector.makeBenchmarkReport(benchmarkResults);
+        BenchmarkReport benchmarkReport = BenchmarkResultInspector.isBenchmarkResultsValid(benchmarkResults);
         assertNotNull(benchmarkReport.getCpuCyclesPerSec());
         assertNull(benchmarkReport.getDiskSpeedMbs());
         assertNull(benchmarkReport.getMemoryReadSpeedGBs());
@@ -55,7 +55,7 @@ public class BenchmarkResultInspectorTest {
     @Test
     public void isBenchmarkResultsValid_should_only_set_disk_speed() {
         benchmarkResults.setDiskSpeedMbs(INVALID_DISK_SPEED);
-        BenchmarkReport benchmarkReport = BenchmarkResultInspector.makeBenchmarkReport(benchmarkResults);
+        BenchmarkReport benchmarkReport = BenchmarkResultInspector.isBenchmarkResultsValid(benchmarkResults);
         assertNull(benchmarkReport.getCpuCyclesPerSec());
         assertNotNull(benchmarkReport.getDiskSpeedMbs());
         assertNull(benchmarkReport.getMemoryReadSpeedGBs());
@@ -65,7 +65,7 @@ public class BenchmarkResultInspectorTest {
     @Test
     public void isBenchmarkResultsValid_should_only_set_memory_read_speed() {
         benchmarkResults.setMemoryReadSpeedGBs(INVALID_MEMORY_READ_SPEED);
-        BenchmarkReport benchmarkReport = BenchmarkResultInspector.makeBenchmarkReport(benchmarkResults);
+        BenchmarkReport benchmarkReport = BenchmarkResultInspector.isBenchmarkResultsValid(benchmarkResults);
         assertNull(benchmarkReport.getCpuCyclesPerSec());
         assertNull(benchmarkReport.getDiskSpeedMbs());
         assertNotNull(benchmarkReport.getMemoryReadSpeedGBs());
@@ -75,7 +75,7 @@ public class BenchmarkResultInspectorTest {
     @Test
     public void isBenchmarkResultsValid_should_only_set_memory_write_speed() {
         benchmarkResults.setMemoryWriteSpeedGBs(INVALID_MEMORY_WRITE_SPEED);
-        BenchmarkReport benchmarkReport = BenchmarkResultInspector.makeBenchmarkReport(benchmarkResults);
+        BenchmarkReport benchmarkReport = BenchmarkResultInspector.isBenchmarkResultsValid(benchmarkResults);
         assertNull(benchmarkReport.getCpuCyclesPerSec());
         assertNull(benchmarkReport.getDiskSpeedMbs());
         assertNull(benchmarkReport.getMemoryReadSpeedGBs());