Gather revision pruning in job controller

2 files changed, 17 insertions, 18 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 48f909df6b6..d66c57b7d7e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -545,19 +545,6 @@ public class ApplicationController {
                 controller.notificationsDb().removeNotifications(notification.source());
         }
 
-        ApplicationVersion oldestDeployedVersion = application.get().oldestDeployedApplication()
-                                                              .orElse(ApplicationVersion.unknown);
-
-        List<ApplicationVersion> olderVersions = application.get().versions().stream()
-                                                            .filter(version -> version.compareTo(oldestDeployedVersion) < 0)
-                                                            .sorted()
-                                                            .collect(Collectors.toList());
-
-        // Remove any version not deployed anywhere - but keep one
-        for (ApplicationVersion version : olderVersions) {
-            application = application.withoutVersion(version);
-        }
-
         store(application);
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index 63c950f5297..ab251c4f46d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -11,6 +11,7 @@ import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.ApplicationController;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.Instance;
+import com.yahoo.vespa.hosted.controller.LockedApplication;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
 import com.yahoo.vespa.hosted.controller.api.integration.LogEntry;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.ApplicationVersion;
@@ -52,6 +53,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.yahoo.collections.Iterables.reversed;
@@ -490,11 +492,7 @@ public class JobController {
 
             application = application.withProjectId(OptionalLong.of(projectId));
             application = application.withNewSubmission(version.get());
-
-            application.get().oldestDeployedApplication().ifPresent(oldestDeployed -> {
-                applications.applicationStore().prune(id.tenant(), id.application(), oldestDeployed);
-                applications.applicationStore().pruneTesters(id.tenant(), id.application(), oldestDeployed);
-            });
+            application = withPrunedRevisions(application);
 
             applications.storeWithUpdatedConfig(application, applicationPackage);
             applications.deploymentTrigger().triggerNewRevision(id);
@@ -502,6 +500,20 @@ public class JobController {
         return version.get();
     }
 
+    private LockedApplication withPrunedRevisions(LockedApplication application){
+        TenantAndApplicationId id = application.get().id();
+        Optional<ApplicationVersion> oldestDeployed = application.get().oldestDeployedApplication();
+        if (oldestDeployed.isPresent()) {
+            controller.applications().applicationStore().prune(id.tenant(), id.application(), oldestDeployed.get());
+            controller.applications().applicationStore().pruneTesters(id.tenant(), id.application(), oldestDeployed.get());
+
+            for (ApplicationVersion version : application.get().versions())
+                if (version.compareTo(oldestDeployed.get()) < 0)
+                    application = application.withoutVersion(version);
+        }
+        return application;
+    }
+
     /** Orders a run of the given type, or throws an IllegalStateException if that job type is already running. */
     public void start(ApplicationId id, JobType type, Versions versions, boolean isRedeployment, Optional<String> reason) {
         start(id, type, versions, isRedeployment, JobProfile.of(type), reason);