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/10/19 15:53:55 UTC
[09/50] [abbrv] ambari git commit: AMBARI-13404 Exported blueprint
contains unmasked hostname in ["drpc_server_host":"storm-site",
"storm_ui_server_host":"storm-site", "supervisor_hosts":"storm-site",
"nimbus_hosts":"storm-site"] (dsen)
AMBARI-13404 Exported blueprint contains unmasked hostname in ["drpc_server_host":"storm-site", "storm_ui_server_host":"storm-site", "supervisor_hosts":"storm-site", "nimbus_hosts":"storm-site"] (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/22f0982d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/22f0982d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/22f0982d
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 22f0982df86002b08ee772bff73d648fbb046c5f
Parents: 52083d1
Author: Dmytro Sen <ds...@apache.org>
Authored: Thu Oct 15 20:28:39 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Thu Oct 15 20:28:39 2015 +0300
----------------------------------------------------------------------
.../internal/BlueprintConfigurationProcessor.java | 5 +++++
.../BlueprintConfigurationProcessorTest.java | 17 +++++++++++++++++
2 files changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/22f0982d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 5fd5563..18fca8a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -2102,9 +2102,14 @@ public class BlueprintConfigurationProcessor {
// STORM
stormSiteMap.put("nimbus.host", new SingleHostTopologyUpdater("NIMBUS"));
+ stormSiteMap.put("nimbus_hosts", new SingleHostTopologyUpdater("NIMBUS"));
+ stormSiteMap.put("drpc_server_host", new SingleHostTopologyUpdater("DRPC_SERVER"));
+ stormSiteMap.put("storm_ui_server_host", new SingleHostTopologyUpdater("STORM_UI_SERVER"));
stormSiteMap.put("worker.childopts", new OptionalSingleHostTopologyUpdater("GANGLIA_SERVER"));
stormSiteMap.put("supervisor.childopts", new OptionalSingleHostTopologyUpdater("GANGLIA_SERVER"));
stormSiteMap.put("nimbus.childopts", new OptionalSingleHostTopologyUpdater("GANGLIA_SERVER"));
+ multiStormSiteMap.put("supervisor_hosts",
+ new YamlMultiValuePropertyDecorator(new MultipleHostTopologyUpdater("SUPERVISOR")));
multiStormSiteMap.put("storm.zookeeper.servers",
new YamlMultiValuePropertyDecorator(new MultipleHostTopologyUpdater("ZOOKEEPER_SERVER")));
multiStormSiteMap.put("nimbus.seeds",
http://git-wip-us.apache.org/repos/asf/ambari/blob/22f0982d/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
index ac86668..34b72b6 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
@@ -448,6 +448,10 @@ public class BlueprintConfigurationProcessorTest {
Map<String, Map<String, String>> properties = new HashMap<String, Map<String, String>>();
Map<String, String> typeProps = new HashMap<String, String>();
typeProps.put("storm.zookeeper.servers", "['testhost:5050','testhost2:9090','testhost2a:9090','testhost2b:9090']");
+ typeProps.put("drpc_server_host", "['testhost:5050']");
+ typeProps.put("storm_ui_server_host", "['testhost:5050']");
+ typeProps.put("supervisor_hosts", "['testhost:5050','testhost2:9090']");
+
properties.put("storm-site", typeProps);
Configuration clusterConfig = new Configuration(properties,
@@ -457,12 +461,16 @@ public class BlueprintConfigurationProcessorTest {
hgComponents.add("NAMENODE");
hgComponents.add("SECONDARY_NAMENODE");
hgComponents.add("ZOOKEEPER_SERVER");
+ hgComponents.add("DRPC_SERVER");
+ hgComponents.add("STORM_UI_SERVER");
+ hgComponents.add("SUPERVISOR");
TestHostGroup group1 = new TestHostGroup("group1", hgComponents, Collections.singleton("testhost"));
Collection<String> hgComponents2 = new HashSet<String>();
hgComponents2.add("DATANODE");
hgComponents2.add("HDFS_CLIENT");
hgComponents2.add("ZOOKEEPER_SERVER");
+ hgComponents2.add("SUPERVISOR");
Set<String> hosts2 = new HashSet<String>();
hosts2.add("testhost2");
hosts2.add("testhost2a");
@@ -488,6 +496,15 @@ public class BlueprintConfigurationProcessorTest {
String updatedVal = properties.get("storm-site").get("storm.zookeeper.servers");
assertEquals("['%HOSTGROUP::group1%:5050','%HOSTGROUP::group2%:9090']", updatedVal);
+
+ String updatedVa2 = properties.get("storm-site").get("drpc_server_host");
+ assertEquals("['%HOSTGROUP::group1%:5050']", updatedVa2);
+
+ String updatedVa3 = properties.get("storm-site").get("storm_ui_server_host");
+ assertEquals("['%HOSTGROUP::group1%:5050']", updatedVa3);
+
+ String updatedVa4 = properties.get("storm-site").get("supervisor_hosts");
+ assertEquals("['%HOSTGROUP::group1%:5050','%HOSTGROUP::group2%:9090']", updatedVa4);
}
@Test