Remove notifications for deactivated deployments

1 files changed, 2 insertions, 0 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 5843354ac1b..b0425dc5fb5 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
@@ -702,6 +702,8 @@ public class ApplicationController {
             controller.routing().policies().refresh(application.get().id().instance(instanceName), application.get().deploymentSpec(), zone);
             if (zone.environment().isManuallyDeployed())
                 applicationStore.putMetaTombstone(id, clock.instant());
+            if (!zone.environment().isTest())
+                controller.notificationsDb().removeNotifications(NotificationSource.from(id));
         }
         return application.with(instanceName, instance -> instance.withoutDeploymentIn(zone));
     }