Review changes

5 files changed, 19 insertions, 19 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentJobExecutor.java
index 42824073f1c..fde5b311cd9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentJobExecutor.java
@@ -19,20 +19,20 @@ import java.util.logging.Logger;
  *
  * @author jvenstad
  */
-public class DeploymentTriggerer extends Maintainer {
+public class DeploymentJobExecutor extends Maintainer {
 
-    private static final Logger log = Logger.getLogger(DeploymentTriggerer.class.getName());
-    static final int triggeringRetries = 5;
+    private static final Logger log = Logger.getLogger(DeploymentJobExecutor.class.getName());
+    private static final int triggeringRetries = 5;
 
     private final BuildService buildService;
     private final Executor executor;
 
-    public DeploymentTriggerer(Controller controller, Duration triggeringInterval, JobControl jobControl, BuildService buildService) {
+    public DeploymentJobExecutor(Controller controller, Duration triggeringInterval, JobControl jobControl, BuildService buildService) {
         this(controller, triggeringInterval, jobControl, buildService, Executors.newFixedThreadPool(20));
     }
 
-    DeploymentTriggerer(Controller controller, Duration triggeringInterval, JobControl jobControl,
-                        BuildService buildService, Executor executor) {
+    DeploymentJobExecutor(Controller controller, Duration triggeringInterval, JobControl jobControl,
+                          BuildService buildService, Executor executor) {
         super(controller, triggeringInterval, jobControl);
         this.buildService = buildService;
         this.executor = executor;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentQueue.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentQueue.java
index 06d7d72a2f3..385de7b5a30 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentQueue.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentQueue.java
@@ -59,7 +59,7 @@ public class DeploymentQueue {
         for (JobType jobType : JobType.values())
             locked(jobType, queue ->
                     queue.stream()
-                            .limit(isCapacityConstrained(jobType) ? 1 : 1 << 30)
+                            .limit(isCapacityConstrained(jobType) ? 1 : Long.MAX_VALUE)
                             .peek(id -> toBuildJob(id, jobType).ifPresent(builder::add))
                             .forEach(queue::remove));
 
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 c63b283ac0a..e72ec5224f1 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
@@ -9,7 +9,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.BuildService;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.OwnershipIssues;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.DeploymentIssues;
 import com.yahoo.vespa.hosted.controller.api.integration.chef.Chef;
-import com.yahoo.vespa.hosted.controller.deployment.DeploymentTriggerer;
+import com.yahoo.vespa.hosted.controller.deployment.DeploymentJobExecutor;
 import com.yahoo.vespa.hosted.controller.maintenance.config.MaintainerConfig;
 import com.yahoo.vespa.hosted.controller.persistence.CuratorDb;
 
@@ -38,7 +38,7 @@ public class ControllerMaintenance extends AbstractComponent {
     private final DeploymentMetricsMaintainer deploymentMetricsMaintainer;
     private final ApplicationOwnershipConfirmer applicationOwnershipConfirmer;
     private final DnsMaintainer dnsMaintainer;
-    private final DeploymentTriggerer deploymentTriggerer;
+    private final DeploymentJobExecutor deploymentJobExecutor;
 
     @SuppressWarnings("unused") // instantiated by Dependency Injection
     public ControllerMaintenance(MaintainerConfig maintainerConfig, Controller controller, CuratorDb curator,
@@ -59,7 +59,7 @@ public class ControllerMaintenance extends AbstractComponent {
         deploymentMetricsMaintainer = new DeploymentMetricsMaintainer(controller, Duration.ofMinutes(10), jobControl);
         applicationOwnershipConfirmer = new ApplicationOwnershipConfirmer(controller, Duration.ofHours(12), jobControl, ownershipIssues);
         dnsMaintainer = new DnsMaintainer(controller, Duration.ofHours(12), jobControl, nameService);
-        deploymentTriggerer = new DeploymentTriggerer(controller, Duration.ofSeconds(30), jobControl, buildService);
+        deploymentJobExecutor = new DeploymentJobExecutor(controller, Duration.ofSeconds(30), jobControl, buildService);
     }
 
     public Upgrader upgrader() { return upgrader; }
@@ -81,7 +81,7 @@ public class ControllerMaintenance extends AbstractComponent {
         deploymentMetricsMaintainer.deconstruct();
         applicationOwnershipConfirmer.deconstruct();
         dnsMaintainer.deconstruct();
-        deploymentTriggerer.deconstruct();
+        deploymentJobExecutor.deconstruct();
     }
 
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggererTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentJobExecutorTest.java
index c93e1375db0..781725bc53c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggererTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentJobExecutorTest.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.assertEquals;
 /**
  * @author jvenstad
  */
-public class DeploymentTriggererTest {
+public class DeploymentJobExecutorTest {
 
     @Test
     public void testMaintenance() {
@@ -36,11 +36,11 @@ public class DeploymentTriggererTest {
         ArrayList<BuildJob> buildJobs = new ArrayList<>();
         BuildService buildService = buildJob -> buildJob.projectId() == project2 ? false : buildJobs.add(buildJob);
 
-        DeploymentTriggerer triggerer = new DeploymentTriggerer(tester.controller(),
-                                                                Duration.ofDays(1),
-                                                                jobControl,
-                                                                buildService,
-                                                                Runnable::run);
+        DeploymentJobExecutor triggerer = new DeploymentJobExecutor(tester.controller(),
+                                                                    Duration.ofDays(1),
+                                                                    jobControl,
+                                                                    buildService,
+                                                                    Runnable::run);
 
         triggerer.maintain();
         assertEquals("No jobs are triggered initially.",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json
index baafca7cf34..f1e4d8c6355 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/responses/maintenance.json
@@ -16,10 +16,10 @@
       "name": "DeploymentIssueReporter"
     },
     {
-      "name": "DeploymentMetricsMaintainer"
+      "name": "DeploymentJobExecutor"
     },
     {
-      "name": "DeploymentTriggerer"
+      "name": "DeploymentMetricsMaintainer"
     },
     {
       "name": "DnsMaintainer"