Don't use BCPInfo to scale down

2 files changed, 18 insertions, 2 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 40b0bd8d88b..f37c9e8e05d 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
@@ -280,7 +280,8 @@ public class ClusterModel {
                                         ( 1 - cpu.queryFraction()) * cpu.idealLoad() *
                                         (clusterSpec.type().isContainer() ? 1 : groupSize());
 
-        double cpuAdjustment = neededTotalVcpPerGroup / currentClusterTotalVcpuPerGroup;
+        // Max 1: Only use bcp group info if it indicates that we need to scale *up*
+        double cpuAdjustment = Math.max(1.0, neededTotalVcpPerGroup / currentClusterTotalVcpuPerGroup);
         return ideal.withCpu(peakLoad().cpu() / cpuAdjustment);
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingUsingBcpGroupInfoTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingUsingBcpGroupInfoTest.java
index 379dbb27d87..034f948d0c9 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingUsingBcpGroupInfoTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingUsingBcpGroupInfoTest.java
@@ -173,7 +173,7 @@ public class AutoscalingUsingBcpGroupInfoTest {
         fixture.store(new BcpGroupInfo(100, 1.1, 0.45));
         fixture.loader().addCpuMeasurements(0.7f, 10);
         fixture.tester().assertResources("No need for traffic shift headroom",
-                                         2, 1, 2.0, 16.0, 40.8,
+                                         3, 1, 4.0, 16.0, 40.8,
                                          fixture.autoscale());
     }
 
@@ -270,6 +270,21 @@ public class AutoscalingUsingBcpGroupInfoTest {
                                          fixture.autoscale());
     }
 
+    @Test
+    public void test_autoscaling_containers_with_some_local_traffic() {
+        var fixture = DynamicProvisioningTester.fixture().clusterType(ClusterSpec.Type.container).awsProdSetup(true).build();
+
+        // Some local traffic
+        fixture.tester().clock().advance(Duration.ofDays(2));
+        fixture.store(new BcpGroupInfo(200, 1.9, 500));
+        Duration duration1 = fixture.loader().addCpuMeasurements(0.01f, 10);
+        fixture.tester().clock().advance(duration1.negated());
+        fixture.loader().addQueryRateMeasurements(10, __ -> 10.0);
+        fixture.tester().assertResources("Not scaling up by group info since remote queries are much cheaper than local",
+                                         2, 1, 2.0, 16.0, 40.8,
+                                         fixture.autoscale());
+    }
+
     /** Tests with varying BCP group info parameters. */
     @Test
     public void test_autoscaling_metrics() {