Browse Source

AMBARI-14344 Exceptions and errors in ambari-server log and out (dsen)

Dmytro Sen 9 years ago
parent
commit
56c12489cd

+ 2 - 4
ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertHostListener.java

@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.EagerSingleton;
 import org.apache.ambari.server.events.AlertHashInvalidationEvent;
 import org.apache.ambari.server.events.HostAddedEvent;
@@ -145,11 +144,10 @@ public class AlertHostListener {
 
           try {
             m_alertDefinitionDao.create(definition);
-          } catch (AmbariException ambariException) {
+          } catch (Exception e) {
             LOG.error(
                 "Unable to create an alert definition named {} in cluster {}",
-                definition.getDefinitionName(), definition.getClusterId(),
-                ambariException);
+                definition.getDefinitionName(), definition.getClusterId(), e);
           }
         }
       }

+ 2 - 1
ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java

@@ -43,6 +43,7 @@ import org.apache.ambari.server.state.alert.SourceType;
   @NamedQuery(name = "AlertDefinitionEntity.findByName", query = "SELECT ad FROM AlertDefinitionEntity ad WHERE ad.definitionName = :definitionName AND ad.clusterId = :clusterId",
     hints = {
       @QueryHint(name = "eclipselink.query-results-cache", value = "true"),
+      @QueryHint(name = "eclipselink.query-results-cache.ignore-null", value = "true"),
       @QueryHint(name = "eclipselink.query-results-cache.size", value = "5000")
     }),
   @NamedQuery(name = "AlertDefinitionEntity.findByService", query = "SELECT ad FROM AlertDefinitionEntity ad WHERE ad.serviceName = :serviceName AND ad.clusterId = :clusterId"),
@@ -526,4 +527,4 @@ public class AlertDefinitionEntity {
     buffer.append("}");
     return buffer.toString();
   }
-}
+}