Merge pull request #20543 from vespa-engine/jonmv/single-mail-per-new-failure

Avoid re-sesnding email for repeated failures

1 files changed, 9 insertions, 0 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index e28273870d7..0d56bc286eb 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -737,6 +737,9 @@ public class InternalStepRunner implements StepRunner {
 
     /** Sends a mail with a notification of a failed run, if one should be sent. */
     private void sendEmailNotification(Run run, DualLogger logger) {
+        if ( ! isNewFailure(run))
+            return;
+
         Application application = controller.applications().requireApplication(TenantAndApplicationId.from(run.id().application()));
         Notifications notifications = application.deploymentSpec().requireInstance(run.id().application().instance()).notifications();
         boolean newCommit = application.require(run.id().application().instance()).change().application()
@@ -760,6 +763,12 @@ public class InternalStepRunner implements StepRunner {
         }
     }
 
+    private boolean isNewFailure(Run run) {
+        return controller.jobController().lastCompleted(run.id().job())
+                         .map(previous -> ! previous.hasFailed() || ! previous.versions().targetsMatch(run.versions()))
+                         .orElse(true);
+    }
+
     private void updateConsoleNotification(Run run) {
         NotificationSource source = NotificationSource.from(run.id());
         Consumer<String> updater = msg -> controller.notificationsDb().setNotification(source, Notification.Type.deployment, Notification.Level.error, msg);