Cancel rollout of skipped revision

1 files changed, 3 insertions, 0 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index e3d1d2b7589..1f9a9b07f71 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -2110,6 +2110,9 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         RevisionId revision = RevisionId.forProduction(Long.parseLong(build));
         controller.applications().lockApplicationOrThrow(id, application -> {
             controller.applications().store(application.withRevisions(revisions -> revisions.with(revisions.get(revision).skipped())));
+            for (Instance instance : application.get().instances().values())
+                if (instance.change().revision().equals(Optional.of(revision)))
+                    controller.applications().deploymentTrigger().cancelChange(instance.id(), ChangesToCancel.APPLICATION);
         });
         return new MessageResponse("Marked build '" + build + "' as non-deployable");
     }