[ambari] branch branch-2.7 updated: AMBARI-24267. No alerts even if Namenode / Datanodes down (amagyar) (#1723)

[am...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

amagyar pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new 3d935c5  AMBARI-24267. No alerts even if Namenode / Datanodes down (amagyar) (#1723)
3d935c5 is described below

commit 3d935c5b5d5894ace8d97fa2a3965181e71dcc6c
Author: Attila Magyar <m....@gmail.com>
AuthorDate: Mon Jul 9 18:08:08 2018 +0200

    AMBARI-24267. No alerts even if Namenode / Datanodes down (amagyar) (#1723)
---
 .../server/agent/stomp/dto/AlertCluster.java       |  20 +++-
 .../server/agent/stomp/dto/AlertClusterTest.java   | 129 +++++++++++++++++++++
 2 files changed, 148 insertions(+), 1 deletion(-)

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/AlertCluster.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/AlertCluster.java
index e4a4234..64a4adc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/AlertCluster.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/dto/AlertCluster.java
@@ -99,9 +99,12 @@ public class AlertCluster {
             if (!oldDefinition.deeplyEquals(newDefinition)) {
               changed = true;
             }
-            mergedDefinitions.put(definitionId, oldDefinition);
+            mergedDefinitions.put(definitionId, newDefinition);
           }
         }
+        if (addNewAlertDefinitions(update, mergedDefinitions)) {
+          changed = true;
+        }
         if (update.getStaleIntervalMultiplier() != null
             && !update.getStaleIntervalMultiplier().equals(staleIntervalMultiplier)) {
           mergedStaleIntervalMultiplier = update.getStaleIntervalMultiplier();
@@ -133,6 +136,21 @@ public class AlertCluster {
     return mergedCluster;
   }
 
+  /**
+   * Add each alert definitions from the update event which are not included in mergedDefinitions
+   * @return true if there was such an alert definition
+   */
+  private boolean addNewAlertDefinitions(AlertCluster update, Map<Long, AlertDefinition> mergedDefinitions) {
+    boolean hasNew = false;
+    for (Map.Entry<Long, AlertDefinition> each : update.alertDefinitions.entrySet()) {
+      if (!mergedDefinitions.containsKey(each.getKey())) {
+        mergedDefinitions.put(each.getKey(), each.getValue());
+        hasNew = true;
+      }
+    }
+    return hasNew;
+  }
+
   public static AlertCluster emptyAlertCluster() {
     return new AlertCluster();
   }
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/stomp/dto/AlertClusterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/stomp/dto/AlertClusterTest.java
new file mode 100644
index 0000000..73b2bf3
--- /dev/null
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/stomp/dto/AlertClusterTest.java
@@ -0,0 +1,129 @@
+/*
+ *
+ *  * Licensed to the Apache Software Foundation (ASF) under one
+ *  * or more contributor license agreements.  See the NOTICE file
+ *  * distributed with this work for additional information
+ *  * regarding copyright ownership.  The ASF licenses this file
+ *  * to you under the Apache License, Version 2.0 (the
+ *  * "License"); you may not use this file except in compliance
+ *  * with the License.  You may obtain a copy of the License at
+ *  *
+ *  *     http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package org.apache.ambari.server.agent.stomp.dto;
+
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.ambari.server.events.AlertDefinitionEventType;
+import org.apache.ambari.server.state.alert.AlertDefinition;
+import org.junit.Test;
+
+public class AlertClusterTest {
+  private static final int DEFAULT_INTERVAL = 1;
+  private static final int CHANGED_INTERVAL = 999;
+  private AlertCluster alertCluster;
+
+  @Test
+  public void testAddingNewAlertDefWithoutChangingExisting() throws Exception {
+    // Given
+    AlertDefinition existing1 = anAlertDefinition(1l);
+    AlertDefinition existing2 = anAlertDefinition(2l);
+    alertCluster = newAlertCluster(existing1, existing2);
+    // When
+    AlertDefinition newDef = anAlertDefinition(3l);
+    AlertCluster result = update(alertCluster, newDef);
+    // Then
+    assertHasAlerts(result, existing1, existing2, newDef);
+  }
+
+  @Test
+  public void testChangingContentOfExistingAlertDef() throws Exception {
+    // Given
+    AlertDefinition existing1 = anAlertDefinition(1l);
+    AlertDefinition existing2 = anAlertDefinition(2l);
+    alertCluster = newAlertCluster(existing1, existing2);
+    // When
+    AlertDefinition changed = anAlertDefinition(2, CHANGED_INTERVAL);
+    AlertCluster result = update(alertCluster, changed);
+    // Then
+    assertHasAlerts(result, existing1, changed);
+  }
+
+  @Test
+  public void testAddingNewAlertDefAndChangingExisting() throws Exception {
+    // Given
+    AlertDefinition existing1 = anAlertDefinition(1l);
+    AlertDefinition existing2 = anAlertDefinition(2l);
+    alertCluster = newAlertCluster(existing1, existing2);
+    // When
+    AlertDefinition newDef = anAlertDefinition(3l);
+    AlertDefinition changed = anAlertDefinition(2, 999);
+    AlertCluster result = update(alertCluster, newDef, changed);
+    // Then
+    assertHasAlerts(result, existing1, changed, newDef);
+  }
+
+  @Test
+  public void testNoChange() throws Exception {
+    // Given
+    AlertDefinition existing = anAlertDefinition(1l);
+    alertCluster = newAlertCluster(existing);
+    // When
+    AlertCluster result = update(alertCluster, existing);
+    // Then
+    assertThat(result, is(nullValue()));
+  }
+
+  private void assertHasAlerts(AlertCluster result, AlertDefinition... expectedItems) {
+    assertNotNull(result);
+    assertThat(result.getAlertDefinitions(), hasSize(expectedItems.length));
+    for (AlertDefinition expected : expectedItems) {
+      assertTrue(result.getAlertDefinitions() + " should have contained: " + expected,
+        result.getAlertDefinitions().stream().anyMatch(each -> each.deeplyEquals(expected)));
+    }
+  }
+
+  private AlertDefinition anAlertDefinition(long id) {
+    return anAlertDefinition(id, DEFAULT_INTERVAL);
+  }
+
+  private AlertDefinition anAlertDefinition(long id, int interval) {
+    AlertDefinition alertDefinition = new AlertDefinition();
+    alertDefinition.setDefinitionId(id);
+    alertDefinition.setName(Long.toString(id));
+    alertDefinition.setInterval(interval);
+    return alertDefinition;
+  }
+
+  private AlertCluster newAlertCluster(AlertDefinition... existingDefinitions) {
+    return new AlertCluster(asMap(existingDefinitions), "host");
+  }
+
+  private Map<Long,AlertDefinition> asMap(AlertDefinition... alertDefinition) {
+    Map<Long, AlertDefinition> alerts = new HashMap<>();
+    for (AlertDefinition each : alertDefinition) {
+      alerts.put(each.getDefinitionId(), each);
+    }
+    return alerts;
+  }
+
+  private AlertCluster update(AlertCluster alertCluster, AlertDefinition... alertDefinitions) {
+    return alertCluster.handleUpdate(AlertDefinitionEventType.UPDATE, newAlertCluster(alertDefinitions));
+  }
+}
\ No newline at end of file