You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/09/30 16:45:31 UTC
[11/50] [abbrv] ambari git commit: AMBARI-13237. Storm performance
issues with topology.metrics.consumer.register enabled. (swagle)
AMBARI-13237. Storm performance issues with topology.metrics.consumer.register enabled. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/360e6088
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/360e6088
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/360e6088
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 360e608861229d7052b49ba44edbd9e3a3cd3854
Parents: cda6853
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Thu Sep 24 18:32:28 2015 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Thu Sep 24 18:32:28 2015 -0700
----------------------------------------------------------------------
.../server/upgrade/UpgradeCatalog212.java | 21 ++++++++++++++++++++
.../0.1.0/configuration/storm-site.xml | 5 -----
2 files changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/360e6088/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
index cab9d3c..12e3ce6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
@@ -19,6 +19,7 @@
package org.apache.ambari.server.upgrade;
import java.sql.SQLException;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -197,6 +198,26 @@ public class UpgradeCatalog212 extends AbstractUpgradeCatalog {
updateOozieConfigs();
updateHbaseAndClusterConfigurations();
updateKafkaConfigurations();
+ updateStormConfigs();
+ }
+
+ protected void updateStormConfigs() throws AmbariException {
+ AmbariManagementController ambariManagementController = injector.getInstance(AmbariManagementController.class);
+ Clusters clusters = ambariManagementController.getClusters();
+
+ if (clusters != null) {
+ Map<String, Cluster> clusterMap = clusters.getClusters();
+
+ if ((clusterMap != null) && !clusterMap.isEmpty()) {
+ // Iterate through the clusters and perform any configuration updates
+ for (final Cluster cluster : clusterMap.values()) {
+ Set<String> removes = new HashSet<String>();
+ removes.add("topology.metrics.consumer.register");
+ updateConfigurationPropertiesForCluster(cluster, "storm-site",
+ new HashMap<String, String>(), removes, false, false);
+ }
+ }
+ }
}
protected void updateKafkaConfigurations() throws AmbariException {
http://git-wip-us.apache.org/repos/asf/ambari/blob/360e6088/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml
index 35456d7..b62d34b 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/storm-site.xml
@@ -22,11 +22,6 @@
<configuration supports_final="true">
<property>
- <name>topology.metrics.consumer.register</name>
- <value>[{'class': 'org.apache.hadoop.metrics2.sink.storm.StormTimelineMetricsSink', 'parallelism.hint': 1}]</value>
- <description>Topology metrics consumer register parameters.</description>
- </property>
- <property>
<name>metrics.reporter.register</name>
<value>org.apache.hadoop.metrics2.sink.storm.StormTimelineMetricsReporter</value>
<description>Topology metrics reporter.</description>