diff options
author | Andreas Eriksen <andreer@pvv.ntnu.no> | 2018-01-16 11:54:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-16 11:54:16 +0100 |
commit | ce8d0e4aa4890d6cf3e405e2eb395a53fc10ab66 (patch) | |
tree | 813ffdb21fedd59aa6389243ed902bcfed5d9660 | |
parent | 22b1a85a65c88559446a6919bb6828ed2665e315 (diff) |
andreer/disable memory benchmark (#4673)
* fix typo
* disable memory benchmark
* disable memory benchmark test
* disable memory read test too
3 files changed, 11 insertions, 10 deletions
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/SpecVerificationReport.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/SpecVerificationReport.java index ef99208a7ce..0494eed5dc5 100644 --- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/SpecVerificationReport.java +++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/verification/commons/report/SpecVerificationReport.java @@ -10,7 +10,7 @@ import com.yahoo.vespa.hosted.node.verification.spec.retrievers.HardwareInfo; /** - * Stores results of caomparing node repo spec and actual hardware info. + * Stores results of comparing node repo spec and actual hardware info. * In case of divergent values, set the corresponding attribute to the actual hardware info value. * Attributes of equal value remain null. * 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 4989c574ed4..5e63706f556 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 @@ -24,13 +24,14 @@ public class BenchmarkResultInspector { benchmarkReport.setCpuCyclesPerSec(cpuCyclesPerSec); } double memoryWriteSpeed = benchmarkResults.getMemoryWriteSpeedGBs(); - if (memoryWriteSpeed < MEMORY_WRITE_SPEED_LOWER_LIMIT) { - benchmarkReport.setMemoryWriteSpeedGBs(memoryWriteSpeed); - } - double memoryReadSpeed = benchmarkResults.getMemoryReadSpeedGBs(); - if (memoryReadSpeed < MEMORY_READ_SPEED_LOWER_LIMIT) { - benchmarkReport.setMemoryReadSpeedGBs(memoryReadSpeed); - } +// TODO: Temporarily disabled due to Meltdown/Spectre performance impact, see VESPA-11051 +// if (memoryWriteSpeed < MEMORY_WRITE_SPEED_LOWER_LIMIT) { +// benchmarkReport.setMemoryWriteSpeedGBs(memoryWriteSpeed); +// } +// double memoryReadSpeed = benchmarkResults.getMemoryReadSpeedGBs(); +// if (memoryReadSpeed < MEMORY_READ_SPEED_LOWER_LIMIT) { +// benchmarkReport.setMemoryReadSpeedGBs(memoryReadSpeed); +// } double diskSpeed = benchmarkResults.getDiskSpeedMbs(); if (diskSpeed < DISK_SPEED_LOWER_LIMIT) { benchmarkReport.setDiskSpeedMbs(diskSpeed); 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 4c999dba35d..0caf63594be 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 @@ -64,7 +64,7 @@ public class BenchmarkResultInspectorTest { assertNull(benchmarkReport.getMemoryWriteSpeedGBs()); } - @Test +// @Test TODO: Temporarily disabled due to Meltdown/Spectre performance impact, see VESPA-11051 public void isBenchmarkResultsValid_should_only_set_memory_read_speed() { benchmarkResults.setMemoryReadSpeedGBs(INVALID_MEMORY_READ_SPEED); BenchmarkReport benchmarkReport = BenchmarkResultInspector.makeBenchmarkReport(benchmarkResults); @@ -74,7 +74,7 @@ public class BenchmarkResultInspectorTest { assertNull(benchmarkReport.getMemoryWriteSpeedGBs()); } - @Test +// @Test TODO: Temporarily disabled due to Meltdown/Spectre performance impact, see VESPA-11051 public void isBenchmarkResultsValid_should_only_set_memory_write_speed() { benchmarkResults.setMemoryWriteSpeedGBs(INVALID_MEMORY_WRITE_SPEED); BenchmarkReport benchmarkReport = BenchmarkResultInspector.makeBenchmarkReport(benchmarkResults); |