AMBARI-9823 - Alert Notifications Are Not Received Without Restarting Ambari Server (jonathanhurley)

ambari-project/pom.xml

@@ -274,7 +274,7 @@ instead of a SNAPSHOT. -->
       <dependency>
         <groupId>org.eclipse.persistence</groupId>
         <artifactId>eclipselink</artifactId>
-        <version>2.4.2</version>
+        <version>2.5.2</version>
       </dependency>
       <dependency>
         <groupId>org.postgresql</groupId>

ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAO.java

@@ -291,7 +291,8 @@ public class AlertDefinitionDAO {
   @Transactional
   public void create(AlertDefinitionEntity alertDefinition)
       throws AmbariException {
-    entityManagerProvider.get().persist(alertDefinition);
+    EntityManager entityManager = entityManagerProvider.get();
+    entityManager.persist(alertDefinition);
 
     AlertGroupEntity group = dispatchDao.findDefaultServiceGroup(
         alertDefinition.getClusterId(), alertDefinition.getServiceName());
@@ -319,6 +320,8 @@ public class AlertDefinitionDAO {
       LOG.warn("Unable to broadcast alert registration event for {}",
           alertDefinition.getDefinitionName());
     }
+
+    entityManager.refresh(alertDefinition);
   }
 
   /**

ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertNoticeEntity.java

@@ -18,6 +18,7 @@
 package org.apache.ambari.server.orm.entities;
 
 import javax.persistence.Basic;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -74,7 +75,7 @@ public class AlertNoticeEntity {
   /**
    * Bi-directional many-to-one association to {@link AlertTargetEntity}
    */
-  @ManyToOne
+  @ManyToOne(cascade = { CascadeType.REFRESH })
   @JoinColumn(name = "target_id", nullable = false)
   private AlertTargetEntity alertTarget;
 
@@ -181,6 +182,7 @@ public class AlertNoticeEntity {
    */
   public void setAlertTarget(AlertTargetEntity alertTarget) {
     this.alertTarget = alertTarget;
+    alertTarget.addAlertNotice(this);
   }
 
   /**

ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertTargetEntity.java

@@ -17,8 +17,11 @@
  */
 package org.apache.ambari.server.orm.entities;
 
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import javax.persistence.Basic;
@@ -38,6 +41,7 @@ import javax.persistence.Lob;
 import javax.persistence.ManyToMany;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
 import javax.persistence.PreRemove;
 import javax.persistence.Table;
 import javax.persistence.TableGenerator;
@@ -99,7 +103,13 @@ public class AlertTargetEntity {
   @ElementCollection(targetClass = AlertState.class)
   @CollectionTable(name = "alert_target_states", joinColumns = @JoinColumn(name = "target_id"))
   @Column(name = "alert_state")
-  private Set<AlertState> alertStates;
+  private Set<AlertState> alertStates = EnumSet.allOf(AlertState.class);
+
+  /**
+   * Bi-directional one-to-many association to {@link AlertNoticeEntity}.
+   */
+  @OneToMany(cascade = CascadeType.REMOVE, mappedBy = "alertTarget")
+  private List<AlertNoticeEntity> alertNotices;
 
   /**
    * Gets the unique ID of this alert target.
@@ -295,6 +305,21 @@ public class AlertTargetEntity {
     }
   }
 
+  /**
+   * Adds the specified notice to the notices that have been sent out for this
+   * target.
+   *
+   * @param notice
+   *          the notice.
+   */
+  protected void addAlertNotice(AlertNoticeEntity notice) {
+    if (null == alertNotices) {
+      alertNotices = new ArrayList<AlertNoticeEntity>();
+    }
+
+    alertNotices.add(notice);
+  }
+
   /**
    * Called before {@link EntityManager#remove(Object)} for this entity, removes
    * the non-owning relationship between targets and groups.
@@ -302,12 +327,10 @@ public class AlertTargetEntity {
   @PreRemove
   public void preRemove() {
     Set<AlertGroupEntity> groups = getAlertGroups();
-    if (groups.isEmpty()) {
-      return;
-    }
-
-    for (AlertGroupEntity group : groups) {
-      group.removeAlertTarget(this);
+    if (!groups.isEmpty()) {
+      for (AlertGroupEntity group : groups) {
+        group.removeAlertTarget(this);
+      }
     }
   }
 

ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAOTest.java

@@ -364,4 +364,23 @@ public class AlertDefinitionDAOTest {
 
     assertEquals(0, dispatchDao.findAllGroups(clusterId).size());
   }
+
+  @Test
+  public void testNestedClusterEntity() throws Exception {
+    AlertDefinitionEntity definition = new AlertDefinitionEntity();
+    definition.setDefinitionName("nested-cluster-entity-test");
+    definition.setServiceName("HDFS");
+    definition.setComponentName(null);
+    definition.setClusterId(clusterId);
+    definition.setHash(UUID.randomUUID().toString());
+    definition.setScheduleInterval(60);
+    definition.setScope(Scope.SERVICE);
+    definition.setSource("{\"type\" : \"SCRIPT\"}");
+    definition.setSourceType(SourceType.SCRIPT);
+    dao.create(definition);
+
+    definition = dao.findById(definition.getDefinitionId());
+    assertNotNull(definition.getCluster());
+    assertEquals(clusterId, definition.getCluster().getClusterId());
+  }
 }

ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java

@@ -444,6 +444,8 @@ public class AlertDispatchDAOTest {
   public void testDeleteTarget() throws Exception {
     AlertTargetEntity target = m_helper.createAlertTarget();
     target = m_dao.findTargetById(target.getTargetId());
+    assertTrue(target.getAlertStates().size() > 0);
+
     assertNotNull(target);
 
     m_dao.remove(target);
@@ -452,6 +454,42 @@ public class AlertDispatchDAOTest {
     assertNull(target);
   }
 
+  /**
+  *
+  */
+  @Test
+  public void testDeleteTargetWithNotices() throws Exception {
+    AlertTargetEntity target = m_helper.createAlertTarget();
+
+    List<AlertDefinitionEntity> definitions = createDefinitions();
+    AlertDefinitionEntity definition = definitions.get(0);
+
+    AlertHistoryEntity history = new AlertHistoryEntity();
+    history.setServiceName(definition.getServiceName());
+    history.setClusterId(m_cluster.getClusterId());
+    history.setAlertDefinition(definition);
+    history.setAlertLabel("Label");
+    history.setAlertState(AlertState.OK);
+    history.setAlertText("Alert Text");
+    history.setAlertTimestamp(System.currentTimeMillis());
+    m_alertsDao.create(history);
+
+    AlertNoticeEntity notice = new AlertNoticeEntity();
+    notice.setUuid(UUID.randomUUID().toString());
+    notice.setAlertTarget(target);
+    notice.setAlertHistory(history);
+    notice.setNotifyState(NotificationState.PENDING);
+    m_dao.create(notice);
+
+    notice = m_dao.findNoticeById(notice.getNotificationId());
+    assertEquals(target.getTargetId(), notice.getAlertTarget().getTargetId());
+
+    target = m_dao.findTargetById(target.getTargetId());
+    m_dao.remove(target);
+    notice = m_dao.findNoticeById(notice.getNotificationId());
+    assertNull(notice);
+  }
+
   /**
    *
    */

ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java

@@ -835,6 +835,15 @@ public class AlertsDAOTest {
 
     assertEquals(newHistory.getAlertState(),
         newCurrent.getAlertHistory().getAlertState());
+
+    newCurrent = m_dao.findCurrentById(current.getAlertId());
+
+    assertEquals(newHistory.getAlertId(),
+        newCurrent.getAlertHistory().getAlertId());
+
+    assertEquals(newHistory.getAlertState(),
+        newCurrent.getAlertHistory().getAlertState());
+
   }
 
   /**

ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java

@@ -103,7 +103,7 @@ public class AlertStateChangedEventTest {
    */
   @Test
   public void testAlertNoticeCreationFromEvent() throws Exception {
-    AlertTargetEntity alertTarget = EasyMock.createMock(AlertTargetEntity.class);
+    AlertTargetEntity alertTarget = EasyMock.createNiceMock(AlertTargetEntity.class);
     AlertGroupEntity alertGroup = EasyMock.createMock(AlertGroupEntity.class);
     List<AlertGroupEntity> groups = new ArrayList<AlertGroupEntity>();
     Set<AlertTargetEntity> targets = new HashSet<AlertTargetEntity>();