Merge pull request #18689 from vespa-engine/olaa/log-approval

Only main controllers approve cmrs

1 files changed, 6 insertions, 1 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java
index 59156b62b96..46dba064a95 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeRequestMaintainer.java
@@ -34,12 +34,14 @@ public class ChangeRequestMaintainer extends ControllerMaintainer {
     private final ChangeRequestClient changeRequestClient;
     private final CuratorDb curator;
     private final NodeRepository nodeRepository;
+    private final SystemName system;
 
     public ChangeRequestMaintainer(Controller controller, Duration interval) {
         super(controller, interval, null, SystemName.allOf(Predicate.not(SystemName::isPublic)));
         this.changeRequestClient = controller.serviceRegistry().changeRequestClient();
         this.curator = controller.curator();
         this.nodeRepository = controller.serviceRegistry().configServer().nodeRepository();
+        this.system = controller.system();
     }
 
 
@@ -124,7 +126,10 @@ public class ChangeRequestMaintainer extends ControllerMaintainer {
     }
 
     private void approveChangeRequest(ChangeRequest changeRequest) {
-        if (changeRequest.getApproval() == ChangeRequest.Approval.REQUESTED)
+        if (system.equals(SystemName.main) &&
+                changeRequest.getApproval() == ChangeRequest.Approval.REQUESTED) {
+            logger.info("Approving " + changeRequest.getChangeRequestSource().getId());
             changeRequestClient.approveChangeRequest(changeRequest);
+        }
     }
 }