You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2015/06/13 18:00:30 UTC
[1/3] ambari git commit: AMBARI-11841. Alerts received in single
heartbeat should be processed in batch. (mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 a8863851e -> bb486eb8d
refs/heads/trunk e71aef020 -> 65b6a8931
AMBARI-11841. Alerts received in single heartbeat should be processed in batch. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/029e462f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/029e462f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/029e462f
Branch: refs/heads/trunk
Commit: 029e462f47827ac5507adcc0187df78972cda34f
Parents: e71aef0
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Fri Jun 12 18:02:32 2015 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Sat Jun 13 18:49:17 2015 +0300
----------------------------------------------------------------------
.../apache/ambari/server/orm/entities/AlertDefinitionEntity.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/029e462f/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 16f62e3..d158f7e 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
@@ -526,4 +526,4 @@ public class AlertDefinitionEntity {
buffer.append("}");
return buffer.toString();
}
-}
\ No newline at end of file
+}
[3/3] ambari git commit: AMBARI-11841. Alerts received in single
heartbeat should be processed in batch. Javadoc fix. (mpapirkovskyy)
Posted by mp...@apache.org.
AMBARI-11841. Alerts received in single heartbeat should be processed in batch. Javadoc fix. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bb486eb8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bb486eb8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bb486eb8
Branch: refs/heads/branch-2.1
Commit: bb486eb8d1f52b53b4bd382d5aca9bbf0554e145
Parents: a886385
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Sat Jun 13 18:57:52 2015 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Sat Jun 13 18:58:42 2015 +0300
----------------------------------------------------------------------
.../apache/ambari/server/agent/HeartBeatHandler.java | 5 +++++
.../listeners/alerts/AlertReceivedListener.java | 14 ++++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb486eb8/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index 029341c..1c993ef 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -310,6 +310,11 @@ public class HeartBeatHandler {
if (null != heartbeat.getAlerts()) {
AlertEvent event = new AlertReceivedEvent(heartbeat.getAlerts());
+ for (Alert alert : event.getAlerts()) {
+ if (alert.getHostName() == null) {
+ alert.setHostName(hostname);
+ }
+ }
alertEventPublisher.publish(event);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb486eb8/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
index 53b0cb5..0dd14cb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
@@ -250,6 +250,12 @@ public class AlertReceivedListener {
}
}
+ /**
+ * Saves alert and alert history entities in single transaction
+ * @param toCreate - new alerts, create alert and history
+ * @param toMerge - merge alert only
+ * @param toCreateHistoryAndMerge - create new history, merge alert
+ */
@Transactional
void saveEntities(Map<Alert, AlertCurrentEntity> toCreate, Map<Alert, AlertCurrentEntity> toMerge,
Map<Alert, AlertCurrentEntity> toCreateHistoryAndMerge) {
@@ -269,10 +275,10 @@ public class AlertReceivedListener {
if (LOG.isDebugEnabled()) {
LOG.debug(
- "Alert State Merged: CurrentId {}, CurrentTimestamp {}, HistoryId {}, HistoryState {}",
- entity.getAlertId(), entity.getLatestTimestamp(),
- entity.getAlertHistory().getAlertId(),
- entity.getAlertHistory().getAlertState());
+ "Alert State Merged: CurrentId {}, CurrentTimestamp {}, HistoryId {}, HistoryState {}",
+ entity.getAlertId(), entity.getLatestTimestamp(),
+ entity.getAlertHistory().getAlertId(),
+ entity.getAlertHistory().getAlertState());
}
}
}
[2/3] ambari git commit: AMBARI-11841. Alerts received in single
heartbeat should be processed in batch. Javadoc fix. (mpapirkovskyy)
Posted by mp...@apache.org.
AMBARI-11841. Alerts received in single heartbeat should be processed in batch. Javadoc fix. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/65b6a893
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/65b6a893
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/65b6a893
Branch: refs/heads/trunk
Commit: 65b6a8931498eb52aecd1fca287262447fa127b7
Parents: 029e462
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Sat Jun 13 18:57:52 2015 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Sat Jun 13 18:57:52 2015 +0300
----------------------------------------------------------------------
.../apache/ambari/server/agent/HeartBeatHandler.java | 5 +++++
.../listeners/alerts/AlertReceivedListener.java | 14 ++++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/65b6a893/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index 029341c..1c993ef 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -310,6 +310,11 @@ public class HeartBeatHandler {
if (null != heartbeat.getAlerts()) {
AlertEvent event = new AlertReceivedEvent(heartbeat.getAlerts());
+ for (Alert alert : event.getAlerts()) {
+ if (alert.getHostName() == null) {
+ alert.setHostName(hostname);
+ }
+ }
alertEventPublisher.publish(event);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/65b6a893/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
index 53b0cb5..0dd14cb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
@@ -250,6 +250,12 @@ public class AlertReceivedListener {
}
}
+ /**
+ * Saves alert and alert history entities in single transaction
+ * @param toCreate - new alerts, create alert and history
+ * @param toMerge - merge alert only
+ * @param toCreateHistoryAndMerge - create new history, merge alert
+ */
@Transactional
void saveEntities(Map<Alert, AlertCurrentEntity> toCreate, Map<Alert, AlertCurrentEntity> toMerge,
Map<Alert, AlertCurrentEntity> toCreateHistoryAndMerge) {
@@ -269,10 +275,10 @@ public class AlertReceivedListener {
if (LOG.isDebugEnabled()) {
LOG.debug(
- "Alert State Merged: CurrentId {}, CurrentTimestamp {}, HistoryId {}, HistoryState {}",
- entity.getAlertId(), entity.getLatestTimestamp(),
- entity.getAlertHistory().getAlertId(),
- entity.getAlertHistory().getAlertState());
+ "Alert State Merged: CurrentId {}, CurrentTimestamp {}, HistoryId {}, HistoryState {}",
+ entity.getAlertId(), entity.getLatestTimestamp(),
+ entity.getAlertHistory().getAlertId(),
+ entity.getAlertHistory().getAlertState());
}
}
}