1 files changed, 20 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java
index c0bd1ac03ff..5244d46d0a9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java
@@ -9,6 +9,7 @@ import com.yahoo.vespa.curator.Lock;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.api.application.v4.model.ClusterMetrics;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
+import com.yahoo.vespa.hosted.controller.notify.Notifier;
 import com.yahoo.vespa.hosted.controller.persistence.CuratorDb;
 
 import java.time.Clock;
@@ -32,14 +33,16 @@ public class NotificationsDb {
 
     private final Clock clock;
     private final CuratorDb curatorDb;
+    private final Notifier notifier;
 
     public NotificationsDb(Controller controller) {
-        this(controller.clock(), controller.curator());
+        this(controller.clock(), controller.curator(), controller.notifier());
     }
 
-    NotificationsDb(Clock clock, CuratorDb curatorDb) {
+    NotificationsDb(Clock clock, CuratorDb curatorDb, Notifier notifier) {
         this.clock = clock;
         this.curatorDb = curatorDb;
+        this.notifier = notifier;
     }
 
     public List<TenantName> listTenantsWithNotifications() {
@@ -61,13 +64,24 @@ public class NotificationsDb {
      * already exists, it'll be replaced by this one instead
      */
     public void setNotification(NotificationSource source, Type type, Level level, List<String> messages) {
+        Optional<Notification> changed = Optional.empty();
         try (Lock lock = curatorDb.lockNotifications(source.tenant())) {
-            List<Notification> notifications = curatorDb.readNotifications(source.tenant()).stream()
+            var existingNotifications = curatorDb.readNotifications(source.tenant());
+            List<Notification> notifications = existingNotifications.stream()
                     .filter(notification -> !source.equals(notification.source()) || type != notification.type())
                     .collect(Collectors.toCollection(ArrayList::new));
-            notifications.add(new Notification(clock.instant(), type, level, source, messages));
+            var notification = new Notification(clock.instant(), type, level, source, messages);
+            // Be conservative for now, only dispatch notifications if they are from new source or with new type.
+            // the message content and level is ignored for now
+            if (!existingNotifications.stream().anyMatch(n -> n.source().equals(source) && n.type().equals(type))) {
+                changed = Optional.of(notification);
+            }
+            notifications.add(notification);
             curatorDb.writeNotifications(source.tenant(), notifications);
         }
+        if (changed.isPresent()) {
+           notifier.dispatch(changed.get());
+        }
     }
 
     /** Remove the notification with the given source and type */
@@ -131,8 +145,9 @@ public class NotificationsDb {
                     newNotifications.stream())
                     .collect(Collectors.toUnmodifiableList());
 
-            if (!initial.equals(updated))
+            if (!initial.equals(updated)) {
                 curatorDb.writeNotifications(deploymentSource.tenant(), updated);
+            }
         }
     }