Increase warmup time from 5 to 7 minutes

3 files changed, 7 insertions, 4 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 80ff22eae91..7d6a4730ed8 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
@@ -27,7 +27,7 @@ public class ClusterModel {
     private static final Logger log = Logger.getLogger(ClusterModel.class.getName());
 
     /** Containers typically use more cpu right after generation change, so discard those metrics */
-    public static final Duration warmupDuration = Duration.ofMinutes(5);
+    public static final Duration warmupDuration = Duration.ofMinutes(7);
 
     static final double idealQueryCpuLoad = 0.8;
     static final double idealWriteCpuLoad = 0.95;
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 d0232f6f62f..21389a8745c 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
@@ -71,9 +71,10 @@ public class AutoscalingTest {
     @Test
     public void test_autoscaling_up_is_fast() {
         var fixture = AutoscalingTester.fixture().awsProdSetup(true).build();
-        fixture.loader().applyLoad(new Load(1.0, 1.0, 1.0), 3);
+        fixture.loader().applyLoad(new Load(0.1, 0.1, 0.1), 3);
+        fixture.loader().applyLoad(new Load(1.0, 1.0, 1.0), 1);
         fixture.tester().assertResources("Scaling up since resource usage is too high",
-                                         8, 1, 5.9, 17.7, 89.4,
+                                         8, 1, 5.3, 17.7, 89.4,
                                          fixture.autoscale());
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTest.java
index f74ace5bd3b..876ff058bf7 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTest.java
@@ -153,7 +153,7 @@ public class AutoscalingMaintainerTest {
         // deploy
         tester.deploy(app1, cluster1, app1Capacity);
 
-        int measurements = 5;
+        int measurements = 6;
         Duration samplePeriod = Duration.ofSeconds(150);
         for (int i = 0; i < 20; i++) {
             // Record completion to keep scaling window at minimum
@@ -212,6 +212,8 @@ public class AutoscalingMaintainerTest {
         tester.addMeasurements(1.0f, 0.3f, 0.3f, 0, 1, app1);
         tester.clock().advance(Duration.ofSeconds(150));
         tester.addMeasurements(1.0f, 0.3f, 0.3f, 0, 1, app1);
+        tester.clock().advance(Duration.ofSeconds(150));
+        tester.addMeasurements(1.0f, 0.3f, 0.3f, 0, 1, app1);
         tester.maintainer().maintain();
         assertEquals("Scale up: " + tester.cluster(app1, cluster1).autoscalingStatus(),
                      1,