You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/12/11 20:55:29 UTC
ambari git commit: AMBARI-14344 Exceptions and errors in
ambari-server log and out (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 7c617e64f -> 56c12489c
AMBARI-14344 Exceptions and errors in ambari-server log and out (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/56c12489
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/56c12489
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/56c12489
Branch: refs/heads/trunk
Commit: 56c12489cd7b2eee696d3e0b1257efddad3112e6
Parents: 7c617e6
Author: Dmytro Sen <ds...@apache.org>
Authored: Fri Dec 11 21:55:20 2015 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Fri Dec 11 21:55:20 2015 +0200
----------------------------------------------------------------------
.../server/events/listeners/alerts/AlertHostListener.java | 6 ++----
.../ambari/server/orm/entities/AlertDefinitionEntity.java | 3 ++-
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/56c12489/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertHostListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertHostListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertHostListener.java
index 659d215..50bf77a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertHostListener.java
+++ b/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);
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/56c12489/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java
index d158f7e..9e21bec 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java
+++ b/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();
}
-}
+}
\ No newline at end of file