Revert "Remove redundant logic"

6 files changed, 55 insertions, 49 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index 5f4d40ed2d8..1574801b77b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -467,7 +467,7 @@ public class ControllerTest {
         // back of the queue
         tester.clock().advance(Duration.ofHours(3));
         tester.clock().advance(Duration.ofMinutes(50));
-        tester.readyJobTrigger().maintain();
+        tester.failureRedeployer().maintain();
 
         List<BuildJob> nextJobs = buildSystem.takeJobsToRun();
         assertEquals(2, nextJobs.size());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
index 23033fbc4f8..9f1a373f3dd 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
@@ -16,7 +16,7 @@ import com.yahoo.vespa.hosted.controller.application.ApplicationPackage;
 import com.yahoo.vespa.hosted.controller.application.Change;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType;
-import com.yahoo.vespa.hosted.controller.maintenance.ReadyJobsTrigger;
+import com.yahoo.vespa.hosted.controller.maintenance.FailureRedeployer;
 import com.yahoo.vespa.hosted.controller.maintenance.JobControl;
 import com.yahoo.vespa.hosted.controller.maintenance.Upgrader;
 import com.yahoo.vespa.hosted.controller.versions.VersionStatus;
@@ -46,7 +46,7 @@ public class DeploymentTester {
 
     private final ControllerTester tester;
     private final Upgrader upgrader;
-    private final ReadyJobsTrigger readyJobTrigger;
+    private final FailureRedeployer failureRedeployer;
 
     public DeploymentTester() {
         this(new ControllerTester());
@@ -57,13 +57,13 @@ public class DeploymentTester {
         tester.curator().writeUpgradesPerMinute(100);
         this.upgrader = new Upgrader(tester.controller(), maintenanceInterval, new JobControl(tester.curator()),
                                      tester.curator());
-        this.readyJobTrigger = new ReadyJobsTrigger(tester.controller(), maintenanceInterval,
-                                                    new JobControl(tester.curator()));
+        this.failureRedeployer = new FailureRedeployer(tester.controller(), maintenanceInterval,
+                                                       new JobControl(tester.curator()));
     }
 
     public Upgrader upgrader() { return upgrader; }
 
-    public ReadyJobsTrigger readyJobTrigger() { return readyJobTrigger; }
+    public FailureRedeployer failureRedeployer() { return failureRedeployer; }
 
     public Controller controller() { return tester.controller(); }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
index 10f8e80f318..3ca5e915ca9 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTriggerTest.java
@@ -13,7 +13,7 @@ import com.yahoo.vespa.hosted.controller.application.ApplicationPackage;
 import com.yahoo.vespa.hosted.controller.application.Change;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs;
 import com.yahoo.vespa.hosted.controller.application.DeploymentJobs.JobType;
-import com.yahoo.vespa.hosted.controller.maintenance.ReadyJobsTrigger;
+import com.yahoo.vespa.hosted.controller.maintenance.BlockedChangeDeployer;
 import com.yahoo.vespa.hosted.controller.maintenance.JobControl;
 import org.junit.Test;
 
@@ -63,7 +63,7 @@ public class DeploymentTriggerTest {
         tester.deployAndNotify(app, applicationPackage, false, JobType.systemTest);
         tester.clock().advance(Duration.ofHours(1));
         assertEquals("Nothing scheduled", 0, tester.buildSystem().jobs().size());
-        tester.readyJobTrigger().maintain(); // Causes retry of systemTests
+        tester.failureRedeployer().maintain(); // Causes retry of systemTests
 
         assertEquals("Scheduled retry", 1, tester.buildSystem().jobs().size());
         tester.deployAndNotify(app, applicationPackage, true, JobType.systemTest);
@@ -71,7 +71,7 @@ public class DeploymentTriggerTest {
         // staging-test times out and is retried
         tester.buildSystem().takeJobsToRun();
         tester.clock().advance(Duration.ofHours(12).plus(Duration.ofSeconds(1)));
-        tester.readyJobTrigger().maintain();
+        tester.failureRedeployer().maintain();
         assertEquals("Retried dead job", 1, tester.buildSystem().jobs().size());
         assertEquals(JobType.stagingTest.jobName(), tester.buildSystem().jobs().get(0).jobName());
     }
@@ -128,7 +128,7 @@ public class DeploymentTriggerTest {
 
         // 30 seconds pass, us-west-1 is triggered
         tester.clock().advance(Duration.ofSeconds(30));
-        tester.deploymentTrigger().triggerReadyJobs();
+        tester.deploymentTrigger().triggerDelayed();
 
         // Consume us-west-1 job without reporting completion
         assertEquals(1, buildSystem.jobs().size());
@@ -137,7 +137,7 @@ public class DeploymentTriggerTest {
 
         // 3 minutes pass, delayed trigger does nothing as us-west-1 is still in progress
         tester.clock().advance(Duration.ofMinutes(3));
-        tester.deploymentTrigger().triggerReadyJobs();
+        tester.deploymentTrigger().triggerDelayed();
         assertTrue("No more jobs triggered at this time", buildSystem.jobs().isEmpty());
 
         // us-west-1 completes
@@ -145,18 +145,18 @@ public class DeploymentTriggerTest {
         tester.notifyJobCompletion(JobType.productionUsWest1, application, true);
 
         // Delayed trigger does nothing as not enough time has passed after us-west-1 completion
-        tester.deploymentTrigger().triggerReadyJobs();
+        tester.deploymentTrigger().triggerDelayed();
         assertTrue("No more jobs triggered at this time", buildSystem.jobs().isEmpty());
 
         // 3 minutes pass, us-central-1 is triggered
         tester.clock().advance(Duration.ofMinutes(3));
-        tester.deploymentTrigger().triggerReadyJobs();
+        tester.deploymentTrigger().triggerDelayed();
         tester.deployAndNotify(application, applicationPackage, true, JobType.productionUsCentral1);
         assertTrue("All jobs consumed", buildSystem.jobs().isEmpty());
 
         // Delayed trigger job runs again, with nothing to trigger
         tester.clock().advance(Duration.ofMinutes(10));
-        tester.deploymentTrigger().triggerReadyJobs();
+        tester.deploymentTrigger().triggerDelayed();
         assertTrue("All jobs consumed", buildSystem.jobs().isEmpty());
     }
 
@@ -270,9 +270,9 @@ public class DeploymentTriggerTest {
     public void testBlockRevisionChange() {
         ManualClock clock = new ManualClock(Instant.parse("2017-09-26T17:30:00.00Z")); // Tuesday, 17:30
         DeploymentTester tester = new DeploymentTester(new ControllerTester(clock));
-        ReadyJobsTrigger readyJobsTrigger = new ReadyJobsTrigger(tester.controller(),
-                                                                 Duration.ofHours(1),
-                                                                 new JobControl(tester.controllerTester().curator()));
+        BlockedChangeDeployer blockedChangeDeployer = new BlockedChangeDeployer(tester.controller(),
+                                                                                Duration.ofHours(1),
+                                                                                new JobControl(tester.controllerTester().curator()));
 
         Version version = Version.fromString("5.0");
         tester.updateVersionStatus(version);
@@ -291,7 +291,7 @@ public class DeploymentTriggerTest {
         
         tester.clock().advance(Duration.ofHours(1)); // --------------- Enter block window: 18:30
         
-        readyJobsTrigger.run();
+        blockedChangeDeployer.run();
         assertEquals(0, tester.buildSystem().jobs().size());
         
         String searchDefinition =
@@ -305,7 +305,7 @@ public class DeploymentTriggerTest {
 
         tester.deployTestOnly(app, changedApplication);
 
-        readyJobsTrigger.run();
+        blockedChangeDeployer.run();
         assertEquals(0, tester.buildSystem().jobs().size());
 
         tester.clock().advance(Duration.ofHours(2)); // ---------------- Exit block window: 20:30
@@ -318,14 +318,14 @@ public class DeploymentTriggerTest {
     @Test
     public void testUpgradingButNoJobStarted() {
         DeploymentTester tester = new DeploymentTester();
-        ReadyJobsTrigger readyJobsTrigger = new ReadyJobsTrigger(tester.controller(),
-                                                                 Duration.ofHours(1),
-                                                                 new JobControl(tester.controllerTester().curator()));
+        BlockedChangeDeployer blockedChangeDeployer = new BlockedChangeDeployer(tester.controller(),
+                                                                                Duration.ofHours(1),
+                                                                                new JobControl(tester.controllerTester().curator()));
         LockedApplication app = (LockedApplication)tester.createAndDeploy("default0", 3, "default");
         // Store that we are upgrading but don't start the system-tests job
         tester.controller().applications().store(app.withDeploying(Optional.of(new Change.VersionChange(Version.fromString("6.2")))));
         assertEquals(0, tester.buildSystem().jobs().size());
-        readyJobsTrigger.run();
+        blockedChangeDeployer.run();
         assertEquals(1, tester.buildSystem().jobs().size());
         assertEquals("system-test", tester.buildSystem().jobs().get(0).jobName());
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/FailureRedeployerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/FailureRedeployerTest.java
index fd00123c697..d540db7c790 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/FailureRedeployerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/FailureRedeployerTest.java
@@ -69,7 +69,7 @@ public class FailureRedeployerTest {
 
         // Failure redeployer does not retry failing job for prod.us-east-3 as there's an ongoing deployment
         tester.clock().advance(Duration.ofMinutes(1));
-        tester.readyJobTrigger().maintain();
+        tester.failureRedeployer().maintain();
         assertFalse("Job is not retried", tester.buildSystem().jobs().stream()
                 .anyMatch(j -> j.jobName().equals(DeploymentJobs.JobType.productionUsEast3.jobName())));
 
@@ -87,7 +87,7 @@ public class FailureRedeployerTest {
 
         // Failure redeployer retries job
         tester.clock().advance(Duration.ofMinutes(5));
-        tester.readyJobTrigger().maintain();
+        tester.failureRedeployer().maintain();
         assertEquals("Job is retried", 1, tester.buildSystem().jobs().size());
 
         // Production job finally succeeds
@@ -111,12 +111,12 @@ public class FailureRedeployerTest {
 
         // staging-test starts, but does not complete
         assertEquals(DeploymentJobs.JobType.stagingTest.jobName(), tester.buildSystem().takeJobsToRun().get(0).jobName());
-        tester.readyJobTrigger().maintain();
+        tester.failureRedeployer().maintain();
         assertTrue("No jobs retried", tester.buildSystem().jobs().isEmpty());
 
         // Just over 12 hours pass, job is retried
         tester.clock().advance(Duration.ofHours(12).plus(Duration.ofSeconds(1)));
-        tester.readyJobTrigger().maintain();
+        tester.failureRedeployer().maintain();
         assertEquals(DeploymentJobs.JobType.stagingTest.jobName(), tester.buildSystem().takeJobsToRun().get(0).jobName());
 
         // Deployment completes
@@ -169,7 +169,7 @@ public class FailureRedeployerTest {
 
         // Failure re-deployer does not retry failing system-test job as it failed for an older change
         tester.clock().advance(Duration.ofMinutes(5));
-        tester.readyJobTrigger().maintain();
+        tester.failureRedeployer().maintain();
         assertTrue("No jobs retried", tester.buildSystem().jobs().isEmpty());
     }
 
@@ -217,7 +217,7 @@ public class FailureRedeployerTest {
         tester.buildSystem().takeJobsToRun();
 
         // Failure re-deployer runs
-        tester.readyJobTrigger().maintain();
+        tester.failureRedeployer().maintain();
         assertTrue("No jobs retried", tester.buildSystem().jobs().isEmpty());
 
         // Deployment completes
@@ -242,7 +242,7 @@ public class FailureRedeployerTest {
         Application application = tester.controllerTester().createApplication(slime);
 
         // Failure redeployer does not restart deployment
-        tester.readyJobTrigger().maintain();
+        tester.failureRedeployer().maintain();
         assertTrue("No jobs scheduled", tester.buildSystem().jobs().isEmpty());
     }
 
@@ -262,7 +262,7 @@ public class FailureRedeployerTest {
         tester.controllerTester().createApplication(slime);
 
         // Failure redeployer does not restart deployment
-        tester.readyJobTrigger().maintain();
+        tester.failureRedeployer().maintain();
         assertTrue("No jobs scheduled", tester.buildSystem().jobs().isEmpty());
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
index 64082adc1c0..e92d5400a3d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java
@@ -474,9 +474,9 @@ public class UpgraderTest {
     public void testBlockVersionChangeHalfwayThough() {
         ManualClock clock = new ManualClock(Instant.parse("2017-09-26T17:00:00.00Z")); // Tuesday, 17:00
         DeploymentTester tester = new DeploymentTester(new ControllerTester(clock));
-        ReadyJobsTrigger readyJobsTrigger = new ReadyJobsTrigger(tester.controller(),
-                                                                 Duration.ofHours(1),
-                                                                 new JobControl(tester.controllerTester().curator()));
+        BlockedChangeDeployer blockedChangeDeployer = new BlockedChangeDeployer(tester.controller(),
+                                                                                Duration.ofHours(1),
+                                                                                new JobControl(tester.controllerTester().curator()));
 
         Version version = Version.fromString("5.0");
         tester.updateVersionStatus(version);
@@ -506,12 +506,12 @@ public class UpgraderTest {
 
         // One hour passes, time is 19:00, still no upgrade
         tester.clock().advance(Duration.ofHours(1));
-        readyJobsTrigger.maintain();
+        blockedChangeDeployer.maintain();
         assertTrue("No jobs scheduled", tester.buildSystem().jobs().isEmpty());
 
         // Another hour pass, time is 20:00 and application upgrades
         tester.clock().advance(Duration.ofHours(1));
-        readyJobsTrigger.maintain();
+        blockedChangeDeployer.maintain();
         tester.deployAndNotify(app, applicationPackage, true, DeploymentJobs.JobType.productionUsCentral1);
         tester.deployAndNotify(app, applicationPackage, true, DeploymentJobs.JobType.productionUsEast3);
         assertTrue("All jobs consumed", tester.buildSystem().jobs().isEmpty());
@@ -528,9 +528,9 @@ public class UpgraderTest {
     public void testBlockVersionChangeHalfwayThoughThenNewVersion() {
         ManualClock clock = new ManualClock(Instant.parse("2017-09-29T16:00:00.00Z")); // Friday, 16:00
         DeploymentTester tester = new DeploymentTester(new ControllerTester(clock));
-        ReadyJobsTrigger readyJobsTrigger = new ReadyJobsTrigger(tester.controller(),
-                                                                 Duration.ofHours(1),
-                                                                 new JobControl(tester.controllerTester().curator()));
+        BlockedChangeDeployer blockedChangeDeployer = new BlockedChangeDeployer(tester.controller(),
+                                                                                Duration.ofHours(1),
+                                                                                new JobControl(tester.controllerTester().curator()));
 
         Version version = Version.fromString("5.0");
         tester.updateVersionStatus(version);
@@ -565,14 +565,14 @@ public class UpgraderTest {
         version = Version.fromString("5.2");
         tester.updateVersionStatus(version);
         tester.upgrader().maintain();
-        readyJobsTrigger.maintain();
+        blockedChangeDeployer.maintain();
         assertTrue("Nothing is scheduled", tester.buildSystem().jobs().isEmpty());
 
         // Monday morning: We are not blocked
         tester.clock().advance(Duration.ofDays(1)); // Sunday, 17:00
         tester.clock().advance(Duration.ofHours(17)); // Monday, 10:00
         tester.upgrader().maintain();
-        readyJobsTrigger.maintain();
+        blockedChangeDeployer.maintain();
         // We proceed with the new version in the expected order, not starting with the previously blocked version:
         // Test jobs are run with the new version, but not production as we are in the block window
         tester.deployAndNotify(app, applicationPackage, true, DeploymentJobs.JobType.systemTest);
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 33b9d4c70d5..3633860772b 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
@@ -1,13 +1,19 @@
 {
   "jobs": [
     {
-      "name": "ClusterInfoMaintainer"
+      "name": "DelayedDeployer"
     },
     {
-      "name": "ClusterUtilizationMaintainer"
+      "name": "BlockedChangeDeployer"
     },
     {
-      "name": "DeploymentExpirer"
+      "name": "Upgrader"
+    },
+    {
+      "name": "FailureRedeployer"
+    },
+    {
+      "name": "VersionStatusUpdater"
     },
     {
       "name": "DeploymentIssueReporter"
@@ -16,19 +22,19 @@
       "name": "DeploymentMetricsMaintainer"
     },
     {
-      "name": "MetricsReporter"
+      "name": "OutstandingChangeDeployer"
     },
     {
-      "name": "OutstandingChangeDeployer"
+      "name": "ClusterUtilizationMaintainer"
     },
     {
-      "name": "ReadyJobsTrigger"
+      "name": "ClusterInfoMaintainer"
     },
     {
-      "name": "Upgrader"
+      "name": "DeploymentExpirer"
     },
     {
-      "name": "VersionStatusUpdater"
+      "name": "MetricsReporter"
     }
   ],
   "inactive": [