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 2016/06/22 10:54:48 UTC
ambari git commit: AMBARI-17340 Alert
mapreduce_history_server_process fails after enabling SSL (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 67acdabbb -> b156a7d1b
AMBARI-17340 Alert mapreduce_history_server_process fails after enabling SSL (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b156a7d1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b156a7d1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b156a7d1
Branch: refs/heads/trunk
Commit: b156a7d1bf6d689a9dfee85c07c5bd72496c158b
Parents: 67acdab
Author: Dmytro Sen <ds...@apache.org>
Authored: Wed Jun 22 13:54:16 2016 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Wed Jun 22 13:54:16 2016 +0300
----------------------------------------------------------------------
.../server/upgrade/UpgradeCatalog240.java | 16 +++++++++---
.../common-services/YARN/2.1.0.2.0/alerts.json | 26 --------------------
.../server/upgrade/UpgradeCatalog240Test.java | 2 ++
3 files changed, 14 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b156a7d1/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
index 1b71230..6ecfa71 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
@@ -763,6 +763,12 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog {
addAll(alertNamesForNameserviceUpdate);
}};
+ // list of alerts to be removed
+ Set<String> alertForRemoval = new HashSet<String>() {{
+ add("storm_rest_api");
+ add("mapreduce_history_server_process");
+ }};
+
LOG.info("Updating alert definitions.");
AmbariManagementController ambariManagementController = injector.getInstance(AmbariManagementController.class);
AlertDefinitionDAO alertDefinitionDAO = injector.getInstance(AlertDefinitionDAO.class);
@@ -901,10 +907,12 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog {
alertDefinitionDAO.merge(atlasMetadataServerWebUI);
}
- AlertDefinitionEntity stormRestApiAlertDefinition = alertDefinitionDAO.findByName(clusterID, "storm_rest_api");
- if (stormRestApiAlertDefinition != null) {
- LOG.info("Removing alert : storm_rest_api");
- alertDefinitionDAO.remove(stormRestApiAlertDefinition);
+ for (String alertName: alertForRemoval) {
+ AlertDefinitionEntity alertDefinition = alertDefinitionDAO.findByName(clusterID, alertName);
+ if (alertDefinition != null) {
+ LOG.info("Removing alert : " + alertName);
+ alertDefinitionDAO.remove(alertDefinition);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b156a7d1/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/alerts.json b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/alerts.json
index 8561922..c4a58bb 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/alerts.json
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/alerts.json
@@ -114,32 +114,6 @@
"value": "{0}"
}
}
- },
- {
- "name": "mapreduce_history_server_process",
- "label": "History Server Process",
- "description": "This host-level alert is triggered if the History Server process cannot be established to be up and listening on the network.",
- "interval": 1,
- "scope": "ANY",
- "enabled": true,
- "source": {
- "type": "PORT",
- "uri": "{{mapred-site/mapreduce.jobhistory.webapp.address}}",
- "default_port": 19888,
- "reporting": {
- "ok": {
- "text": "TCP OK - {0:.3f}s response on port {1}"
- },
- "warning": {
- "text": "TCP OK - {0:.3f}s response on port {1}",
- "value": 1.5
- },
- "critical": {
- "text": "Connection failed: {0} to {1}:{2}",
- "value": 5.0
- }
- }
- }
}
]
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/b156a7d1/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
index 3eea4d3..dfb87b1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
@@ -1660,6 +1660,8 @@ public class UpgradeCatalog240Test {
expect(mockAlertDefinitionDAO.findByName(eq(clusterId), eq("namenode_webui")))
.andReturn(namenodeWebUiAlertDefinitionEntity).atLeastOnce();
+ expect(mockAlertDefinitionDAO.findByName(eq(clusterId), eq("mapreduce_history_server_process")))
+ .andReturn(mockStormRestApiAlertDefinitionEntity).atLeastOnce();
expect(mockAlertDefinitionDAO.findByName(eq(clusterId), eq("storm_rest_api")))
.andReturn(mockStormRestApiAlertDefinitionEntity).atLeastOnce();