diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2021-06-02 23:11:01 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2021-06-02 23:11:01 +0200 |
| commit | 5e9f864dc3f5eb115173d6123abe6febede8064a (patch) | |
| tree | 6e02519a1c1ba127fcbb8475830f1f002de0aadd /node-repository | |
| parent | 88bd4d141bc5c1d1d7793680210268c8b4f48f48 (diff) | |
resource_usage don't need rescaling
Diffstat (limited to 'node-repository')
2 files changed, 15 insertions, 12 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java index 18e35ca531e..3a037efed98 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java @@ -131,11 +131,13 @@ public class MetricsResponse { @Override double computeFinal(ListMap<String, Double> values) { - List<Double> valueList = values.get("content.proton.resource_usage.memory.average"); // prefer over mem.util - if (valueList.isEmpty()) - valueList = values.get("mem.util"); - if (valueList.isEmpty()) return 0; - return valueList.stream().mapToDouble(v -> v).sum() / 100; // convert % to ratio + var valueList = values.get("content.proton.resource_usage.memory.average"); // prefer over mem.util + if ( ! valueList.isEmpty()) return valueList.get(0); + + valueList = values.get("mem.util"); + if ( ! valueList.isEmpty()) return valueList.get(0) / 100; // % to ratio + + return 0; } }, @@ -148,12 +150,13 @@ public class MetricsResponse { @Override double computeFinal(ListMap<String, Double> values) { - List<Double> valueList = values.get("content.proton.resource_usage.disk.average"); // prefer over disk.util - if (valueList.isEmpty()) - valueList = values.get("disk.util"); - if (valueList.isEmpty()) return 0; + var valueList = values.get("content.proton.resource_usage.disk.average"); // prefer over mem.util + if ( ! valueList.isEmpty()) return valueList.get(0); + + valueList = values.get("disk.util"); + if ( ! valueList.isEmpty()) return valueList.get(0) / 100; // % to ratio - return valueList.stream().mapToDouble(v -> v).sum() / 100; // convert % to ratio + return 0; } }, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java index 66ce9e116f6..07f8fa41d24 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java @@ -161,8 +161,8 @@ public class MetricsV2MetricsFetcherTest { " },\n" + " {\n" + " \"values\": {\n" + - " \"content.proton.resource_usage.memory.average\": 35,\n" + - " \"content.proton.resource_usage.disk.average\": 45\n" + + " \"content.proton.resource_usage.memory.average\": 0.35,\n" + + " \"content.proton.resource_usage.disk.average\": 0.45\n" + " },\n" + " \"dimensions\": {\n" + " }\n" + |