set deploymentMetricsMaintainerBaseline to 0.95 (#26793)

4 files changed, 16 insertions, 6 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/BcpGroupUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/BcpGroupUpdater.java
index fe1930a19ea..d61b84e73e9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/BcpGroupUpdater.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/BcpGroupUpdater.java
@@ -51,6 +51,10 @@ public class BcpGroupUpdater extends ControllerMaintainer {
         this.successFactorBaseline = successFactorBaseline;
     }
 
+    public BcpGroupUpdater(Controller controller, Duration duration) {
+        this(controller, duration, 1.0);
+    }
+
     @Override
     protected double maintain() {
         Exception lastException = null;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
index 79b7f780570..216da0d9045 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
@@ -54,7 +54,7 @@ public class ControllerMaintenance extends AbstractComponent {
         maintainers.add(new OutstandingChangeDeployer(controller, intervals.outstandingChangeDeployer));
         maintainers.add(new VersionStatusUpdater(controller, intervals.versionStatusUpdater));
         maintainers.add(new ReadyJobsTrigger(controller, intervals.readyJobsTrigger));
-        maintainers.add(new DeploymentMetricsMaintainer(controller, intervals.deploymentMetricsMaintainer));
+        maintainers.add(new DeploymentMetricsMaintainer(controller, intervals.deploymentMetricsMaintainer, successFactorBaseline.deploymentMetricsMaintainerBaseline));
         maintainers.add(new ApplicationOwnershipConfirmer(controller, intervals.applicationOwnershipConfirmer, controller.serviceRegistry().ownershipIssues()));
         maintainers.add(new SystemUpgrader(controller, intervals.systemUpgrader));
         maintainers.add(new JobRunner(controller, intervals.jobRunner));
@@ -193,11 +193,13 @@ public class ControllerMaintenance extends AbstractComponent {
     private static class SuccessFactorBaseline {
 
         private final Double defaultSuccessFactorBaseline;
+        private final Double deploymentMetricsMaintainerBaseline;
         private final Double trafficFractionUpdater;
 
         public SuccessFactorBaseline(SystemName system) {
             Objects.requireNonNull(system);
             this.defaultSuccessFactorBaseline = 1.0;
+            this.deploymentMetricsMaintainerBaseline = 0.95;
             this.trafficFractionUpdater = system.isCd() ? 0.5 : 0.65;
         }
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
index 427ee7c4b06..29266a25c5e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainer.java
@@ -39,11 +39,15 @@ public class DeploymentMetricsMaintainer extends ControllerMaintainer {
 
     private final ApplicationController applications;
 
-    public DeploymentMetricsMaintainer(Controller controller, Duration duration) {
-        super(controller, duration);
+    public DeploymentMetricsMaintainer(Controller controller, Duration duration, Double successFactorBaseline) {
+        super(controller, duration, successFactorBaseline);
         this.applications = controller.applications();
     }
 
+    public DeploymentMetricsMaintainer(Controller controller, Duration duration) {
+        this(controller, duration, 1.0);
+    }
+
     @Override
     protected double maintain() {
         AtomicInteger failures = new AtomicInteger(0);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/BcpGroupUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/BcpGroupUpdaterTest.java
index b8b05bfcfc1..8537fdaa9f5 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/BcpGroupUpdaterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/BcpGroupUpdaterTest.java
@@ -45,7 +45,7 @@ public class BcpGroupUpdaterTest {
         tester.controllerTester().upgradeSystem(Version.fromString("7.1"));
         var context = tester.newDeploymentContext();
         var deploymentMetricsMaintainer = new DeploymentMetricsMaintainer(tester.controller(), Duration.ofDays(1));
-        var updater = new BcpGroupUpdater(tester.controller(), Duration.ofDays(1), 1.0);
+        var updater = new BcpGroupUpdater(tester.controller(), Duration.ofDays(1));
         ZoneId prod1 = ZoneId.from("prod", "ap-northeast-1");
         ZoneId prod2 = ZoneId.from("prod", "us-east-3");
         ZoneId prod3 = ZoneId.from("prod", "us-west-1");
@@ -129,7 +129,7 @@ public class BcpGroupUpdaterTest {
                                       locked -> tester.controller().applications().store(locked.with(deploymentSpec)));
 
         var deploymentMetricsMaintainer = new DeploymentMetricsMaintainer(tester.controller(), Duration.ofDays(1));
-        var updater = new BcpGroupUpdater(tester.controller(), Duration.ofDays(1), 1.0);
+        var updater = new BcpGroupUpdater(tester.controller(), Duration.ofDays(1));
 
         ZoneId ap1 = ZoneId.from("prod", "ap-northeast-1");
         ZoneId ap2 = ZoneId.from("prod", "ap-southeast-1");
@@ -197,7 +197,7 @@ public class BcpGroupUpdaterTest {
                                           locked -> tester.controller().applications().store(locked.with(deploymentSpec)));
 
         var deploymentMetricsMaintainer = new DeploymentMetricsMaintainer(tester.controller(), Duration.ofDays(1));
-        var updater = new BcpGroupUpdater(tester.controller(), Duration.ofDays(1), 1.0);
+        var updater = new BcpGroupUpdater(tester.controller(), Duration.ofDays(1));
 
         ZoneId ap1 = ZoneId.from("prod", "ap-northeast-1");
         ZoneId ap2 = ZoneId.from("prod", "ap-southeast-1");