Move successFactorBaseline setting to ControllerMaintenance

3 files changed, 6 insertions, 4 deletions

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 fa67e20f53f..6fae732df0a 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
@@ -47,7 +47,7 @@ public class ControllerMaintenance extends AbstractComponent {
         maintainers.add(osUpgradeScheduler);
         maintainers.addAll(osUpgraders(controller, intervals.osUpgrader));
         maintainers.add(new DeploymentExpirer(controller, intervals.defaultInterval));
-        maintainers.add(new DeploymentInfoMaintainer(controller, intervals.deploymentInfoMaintainer));
+        maintainers.add(new DeploymentInfoMaintainer(controller, intervals.deploymentInfoMaintainer, successFactorBaseline.deploymentInfoMaintainerBaseline));
         maintainers.add(new DeploymentUpgrader(controller, intervals.defaultInterval));
         maintainers.add(new DeploymentIssueReporter(controller, controller.serviceRegistry().deploymentIssues(), intervals.defaultInterval));
         maintainers.add(new MetricsReporter(controller, metric, athenzClientFactory.createZmsClient()));
@@ -200,11 +200,13 @@ public class ControllerMaintenance extends AbstractComponent {
 
         private final Double deploymentMetricsMaintainerBaseline;
         private final Double trafficFractionUpdater;
+        private final Double deploymentInfoMaintainerBaseline;
 
         public SuccessFactorBaseline(SystemName system) {
             Objects.requireNonNull(system);
             this.deploymentMetricsMaintainerBaseline = 0.90;
             this.trafficFractionUpdater = system.isCd() ? 0.5 : 0.65;
+            this.deploymentInfoMaintainerBaseline = system.isCd() ? 0.5 : 0.95;
         }
 
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentInfoMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentInfoMaintainer.java
index 8ce0cd9f31c..b2b06cf281f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentInfoMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentInfoMaintainer.java
@@ -22,8 +22,8 @@ public class DeploymentInfoMaintainer extends ControllerMaintainer {
 
     private final NodeRepository nodeRepository;
 
-    public DeploymentInfoMaintainer(Controller controller, Duration duration) {
-        super(controller, duration, 0.95);
+    public DeploymentInfoMaintainer(Controller controller, Duration duration, Double successFactorBaseline) {
+        super(controller, duration, successFactorBaseline);
         this.nodeRepository = controller.serviceRegistry().configServer().nodeRepository();
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentInfoMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentInfoMaintainerTest.java
index 5b9fb8ccb5f..4c3463895a1 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentInfoMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentInfoMaintainerTest.java
@@ -33,7 +33,7 @@ public class DeploymentInfoMaintainerTest {
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder().region(z1.region()).region(z2.region()).trustDefaultCertificate().build();
         List.of(app1, app2).forEach(app -> tester.newDeploymentContext(app).submit(applicationPackage).deploy());
 
-        var maintainer = new DeploymentInfoMaintainer(tester.controller(), Duration.ofMinutes(5));
+        var maintainer = new DeploymentInfoMaintainer(tester.controller(), Duration.ofMinutes(5), 0.95);
         var nodeRepo = tester.configServer().nodeRepository().allowPatching(true);
         nodeRepo.putApplication(z1, new Application(app1, List.of()));
         nodeRepo.putApplication(z1, new Application(app2, List.of()));