diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2020-03-20 13:05:08 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2020-03-20 13:05:08 +0100 |
commit | ca1b10851bcc4854b68a0f9577a6d655774b081d (patch) | |
tree | 257d645450b25f3ef2705c1b043aa0b53957db11 /node-repository | |
parent | cc659eb6a33016e412f89b797ea09b10fa4c5f3a (diff) |
Use memory metric which includes memory-mapped files
Diffstat (limited to 'node-repository')
3 files changed, 7 insertions, 7 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java index 0eac14d61ca..7393ead5987 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java @@ -20,7 +20,7 @@ public enum Resource { /** Memory utilization ratio */ memory { - String metricName() { return "mem.util"; } + String metricName() { return "mem_total.util"; } double idealAverageLoad() { return 0.7; } double valueFrom(NodeResources resources) { return resources.memoryGb(); } double valueFromMetric(double metricValue) { return metricValue / 100; } // % to ratio diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingIntegrationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingIntegrationTest.java index 0cb97bb65d7..d154af4f025 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingIntegrationTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingIntegrationTest.java @@ -71,7 +71,7 @@ public class AutoscalingIntegrationTest { " {\n" + " \"values\": {\n" + " \"cpu.util\": 16.2,\n" + - " \"mem.util\": 23.1,\n" + + " \"mem_total.util\": 23.1,\n" + " \"disk.util\": 82\n" + " },\n" + " \"dimensions\": {\n" + @@ -90,7 +90,7 @@ public class AutoscalingIntegrationTest { " {\n" + " \"values\": {\n" + " \"cpu.util\": 20,\n" + - " \"mem.util\": 23.1,\n" + + " \"mem_total.util\": 23.1,\n" + " \"disk.util\": 40\n" + " },\n" + " \"dimensions\": {\n" + diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcherTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcherTest.java index da4f74bf05b..3dfebedb0e6 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcherTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsFetcherTest.java @@ -41,7 +41,7 @@ public class NodeMetricsFetcherTest { httpClient.requestsReceived.get(0)); assertEquals(5, values.size()); assertEquals("metric value cpu.util: 16.2 at 1970-01-01T00:20:34Z for host-1.yahoo.com", values.get(0).toString()); - assertEquals("metric value mem.util: 23.1 at 1970-01-01T00:20:34Z for host-1.yahoo.com", values.get(1).toString()); + assertEquals("metric value mem_total.util: 23.1 at 1970-01-01T00:20:34Z for host-1.yahoo.com", values.get(1).toString()); assertEquals("metric value disk.util: 82.0 at 1970-01-01T00:20:34Z for host-1.yahoo.com", values.get(2).toString()); assertEquals("metric value cpu.util: 20.0 at 1970-01-01T00:20:00Z for host-2.yahoo.com", values.get(3).toString()); assertEquals("metric value disk.util: 40.0 at 1970-01-01T00:20:00Z for host-2.yahoo.com", values.get(4).toString()); @@ -54,7 +54,7 @@ public class NodeMetricsFetcherTest { httpClient.requestsReceived.get(1)); assertEquals(3, values.size()); assertEquals("metric value cpu.util: 10.0 at 1970-01-01T00:21:40Z for host-3.yahoo.com", values.get(0).toString()); - assertEquals("metric value mem.util: 15.0 at 1970-01-01T00:21:40Z for host-3.yahoo.com", values.get(1).toString()); + assertEquals("metric value mem_total.util: 15.0 at 1970-01-01T00:21:40Z for host-3.yahoo.com", values.get(1).toString()); assertEquals("metric value disk.util: 20.0 at 1970-01-01T00:21:40Z for host-3.yahoo.com", values.get(2).toString()); } } @@ -87,7 +87,7 @@ public class NodeMetricsFetcherTest { " {\n" + " \"values\": {\n" + " \"cpu.util\": 16.2,\n" + - " \"mem.util\": 23.1,\n" + + " \"mem_total.util\": 23.1,\n" + " \"disk.util\": 82\n" + " },\n" + " \"dimensions\": {\n" + @@ -130,7 +130,7 @@ public class NodeMetricsFetcherTest { " {\n" + " \"values\": {\n" + " \"cpu.util\": 10,\n" + - " \"mem.util\": 15,\n" + + " \"mem_total.util\": 15,\n" + " \"disk.util\": 20\n" + " },\n" + " \"dimensions\": {\n" + |