Discard notification entires with outdated job type

1 files changed, 10 insertions, 0 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NotificationsSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NotificationsSerializer.java
index 16ec240a116..99687a9893c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NotificationsSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NotificationsSerializer.java
@@ -69,6 +69,16 @@ public class NotificationsSerializer {
 
     public List<Notification> fromSlime(TenantName tenantName, Slime slime) {
         return SlimeUtils.entriesStream(slime.get().field(notificationsFieldName))
+                .filter(inspector -> { // TODO: remove in summer.
+                    if ( ! inspector.field(jobTypeField).valid()) return true;
+                    try {
+                        JobType.ofSerialized(inspector.field(jobTypeField).asString());
+                        return true;
+                    }
+                    catch (RuntimeException e) {
+                        return false;
+                    }
+                })
                 .map(inspector -> fromInspector(tenantName, inspector))
                 .collect(Collectors.toUnmodifiableList());
     }