From d211e5d201d2452713289cb97710c12dffc42c72 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Sat, 26 Jun 2021 00:25:44 +0200 Subject: Reduce ideal memory --- .../com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java | 2 +- .../yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java | 8 ++++---- .../provision/maintenance/ScalingSuggestionsMaintainerTest.java | 6 +++--- .../vespa/hosted/provision/restapi/responses/application1.json | 2 +- .../vespa/hosted/provision/restapi/responses/application2.json | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java index bbac3bf93da..4d4ed146f5a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java @@ -28,7 +28,7 @@ public class ClusterModel { static final double idealQueryCpuLoad = 0.8; static final double idealWriteCpuLoad = 0.95; - static final double idealMemoryLoad = 0.7; + static final double idealMemoryLoad = 0.65; static final double idealDiskLoad = 0.6; private final Application application; diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java index d07ef8e435f..d65ae143487 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java @@ -218,7 +218,7 @@ public class AutoscalingTest { tester.deploy(application1, cluster1, 5, 1, resources); tester.addMeasurements(0.05f, 0.05f, 0.05f, 0, 120, application1); tester.assertResources("Scaling down to limit since resource usage is low", - 4, 1, 1.8, 7.4, 10.0, + 4, 1, 1.8, 7.7, 10.0, tester.autoscale(application1, cluster1.id(), min, max).target()); } @@ -453,7 +453,7 @@ public class AutoscalingTest { tester.clock().advance(Duration.ofMinutes(-10 * 5)); tester.addQueryRateMeasurements(application1, cluster1.id(), 10, t -> t == 0 ? 20.0 : 10.0); // Query traffic only tester.assertResources("Increase group size to reduce memory load", - 8, 2, 12.4, 89.3, 62.5, + 8, 2, 12.4, 96.2, 62.5, tester.autoscale(application1, cluster1.id(), min, max).target()); } @@ -522,7 +522,7 @@ public class AutoscalingTest { tester.clock().advance(Duration.ofMinutes(-10 * 5)); tester.addQueryRateMeasurements(application1, cluster1.id(), 10, t -> t == 0 ? 20.0 : 10.0); // Query traffic only tester.assertResources("Scaling up", - 4, 1, 6.7, 20, 200, + 4, 1, 6.7, 20.5, 200, tester.autoscale(application1, cluster1.id(), min, max).target()); } @@ -537,7 +537,7 @@ public class AutoscalingTest { tester.clock().advance(Duration.ofMinutes(-10 * 5)); tester.addQueryRateMeasurements(application1, cluster1.id(), 10, t -> t == 0 ? 20.0 : 10.0); // Query traffic only tester.assertResources("Scaling up", - 4, 1, 6.7, 34, 200, + 4, 1, 6.7, 35.5, 200, tester.autoscale(application1, cluster1.id(), min, max).target()); } } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java index 7ab21946379..0a6a1497fdc 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java @@ -68,9 +68,9 @@ public class ScalingSuggestionsMaintainerTest { new TestMetric()); maintainer.maintain(); - assertEquals("12 nodes with [vcpu: 6.0, memory: 5.1 Gb, disk 15.0 Gb, bandwidth: 0.1 Gbps]", + assertEquals("11 nodes with [vcpu: 6.5, memory: 5.5 Gb, disk 15.0 Gb, bandwidth: 0.1 Gbps]", suggestionOf(app1, cluster1, tester).get().resources().toString()); - assertEquals("8 nodes with [vcpu: 11.0, memory: 4.0 Gb, disk 11.8 Gb, bandwidth: 0.1 Gbps]", + assertEquals("8 nodes with [vcpu: 11.0, memory: 4.4 Gb, disk 11.8 Gb, bandwidth: 0.1 Gbps]", suggestionOf(app2, cluster2, tester).get().resources().toString()); // Utilization goes way down @@ -78,7 +78,7 @@ public class ScalingSuggestionsMaintainerTest { addMeasurements(0.10f, 0.10f, 0.10f, 0, 500, app1, tester.nodeRepository()); maintainer.maintain(); assertEquals("Suggestion stays at the peak value observed", - "12 nodes with [vcpu: 6.0, memory: 5.1 Gb, disk 15.0 Gb, bandwidth: 0.1 Gbps]", + "11 nodes with [vcpu: 6.5, memory: 5.5 Gb, disk 15.0 Gb, bandwidth: 0.1 Gbps]", suggestionOf(app1, cluster1, tester).get().resources().toString()); // Utilization is still way down and a week has passed tester.clock().advance(Duration.ofDays(7)); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json index ca0c548c1be..689b6f3816b 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application1.json @@ -69,7 +69,7 @@ "idealCpu": 0.275, "currentCpu": 0.0, "memory" : 0.0, - "idealMemory": 0.7, + "idealMemory": 0.65, "currentMemory": 0.0, "disk" : 0.0, "idealDisk": 0.6, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json index c7eaa4af974..705393b2903 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/application2.json @@ -45,7 +45,7 @@ "idealCpu": 0.2664285714285714, "currentCpu": 0.0, "memory" : 0.0, - "idealMemory": 0.7, + "idealMemory": 0.65, "currentMemory": 0.0, "disk" : 0.0, "idealDisk": 0.6, -- cgit v1.2.3