Merge pull request #11014 from vespa-engine/jvenstad/delete-packages-only-when-application-is-deleted

Delete all packages when the whole application is deleted :scream:

1 files changed, 3 insertions, 3 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 703fc71dc31..76fec14a2d9 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
@@ -745,6 +745,9 @@ public class ApplicationController {
         for (ApplicationId instance : instances)
             deleteInstance(instance);
 
+        applicationStore.removeAll(id.tenant(), id.application());
+        applicationStore.removeAllTesters(id.tenant(), id.application());
+
         if (tenant.type() != Tenant.Type.user)
             accessControl.deleteApplication(id, credentials.get());
         curator.removeApplication(id);
@@ -766,9 +769,6 @@ public class ApplicationController {
                                                    application.get().require(instanceId.instance()).deployments().keySet().stream().map(ZoneId::toString)
                                                               .sorted().collect(Collectors.joining(", ")));
 
-            applicationStore.removeAll(instanceId.tenant(), instanceId.application());
-            applicationStore.removeAllTesters(instanceId.tenant(), instanceId.application());
-
             Instance instance = application.get().require(instanceId.instance());
             instance.rotations().forEach(assignedRotation -> {
                 var endpoints = instance.endpointsIn(controller.system(), assignedRotation.endpointId());