Delay commits during block window

1 files changed, 2 insertions, 4 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 8bc61d6bc3b..a5896658e5f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -480,10 +480,8 @@ public class DeploymentTrigger {
     // ---------- Change management o_O ----------
 
     private boolean acceptNewApplicationVersion(Application application) {
-        if (    ! application.deploymentSpec().canChangeRevisionAt(clock.instant()) // If rolling out revision
-             &&   application.changeAt(clock.instant()).application().isPresent()   // which isn't complete, but in prod
-             && ! application.deploymentJobs().hasFailures()) return false;         // and isn't failing, delay the new submission.
-        if (application.change().application().isPresent()) return true; // More application changes are ok.
+        if ( ! application.deploymentSpec().canChangeRevisionAt(clock.instant())) return false;
+        if (application.change().application().isPresent()) return true; // Replacing a previous application change is ok.
         if (application.deploymentJobs().hasFailures()) return true; // Allow changes to fix upgrade problems.
         return ! application.changeAt(clock.instant()).platform().isPresent();
     }