Repository: ambari Updated Branches: refs/heads/branch-1.7.0 de49f5e28 -> 14302687e
AMBARI-7869. Added export handling for new Hive/Zookeeper config property in HDP 2.2 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/14302687 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/14302687 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/14302687 Branch: refs/heads/branch-1.7.0 Commit: 14302687e811a4a17dd261d7ff95a68c4afb6e07 Parents: de49f5e Author: Robert Nettleton <rnettle...@hortonworks.com> Authored: Wed Oct 22 13:19:41 2014 -0400 Committer: John Speidel <jspei...@hortonworks.com> Committed: Wed Oct 22 13:21:24 2014 -0400 ---------------------------------------------------------------------- .../controller/internal/BlueprintConfigurationProcessor.java | 1 + .../internal/BlueprintConfigurationProcessorTest.java | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/14302687/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 0b58c8d..10cc016 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 @@ -940,6 +940,7 @@ public class BlueprintConfigurationProcessor { multiWebhcatSiteMap.put("templeton.kerberos.principal", new MultipleHostTopologyUpdater("WEBHCAT_SERVER")); hiveEnvMap.put("hive_hostname", new SingleHostTopologyUpdater("HIVE_SERVER")); multiHiveSiteMap.put("hive.zookeeper.quorum", new MultipleHostTopologyUpdater("ZOOKEEPER_SERVER")); + multiHiveSiteMap.put("hive.cluster.delegation.token.store.zookeeper.connectString", new MultipleHostTopologyUpdater("ZOOKEEPER_SERVER")); // OOZIE_SERVER oozieSiteMap.put("oozie.base.url", new SingleHostTopologyUpdater("OOZIE_SERVER")); http://git-wip-us.apache.org/repos/asf/ambari/blob/14302687/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 a57bacb..260d043 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 @@ -1641,6 +1641,7 @@ public class BlueprintConfigurationProcessorTest { hiveSiteProperties.put("hive.metastore.uris", expectedHostName + ":" + expectedPortNum); hiveSiteProperties.put("javax.jdo.option.ConnectionURL", expectedHostName + ":" + expectedPortNum); hiveSiteProperties.put("hive.zookeeper.quorum", expectedHostName + ":" + expectedPortNum + "," + expectedHostNameTwo + ":" + expectedPortNum); + hiveSiteProperties.put("hive.cluster.delegation.token.store.zookeeper.connectString", expectedHostName + ":" + expectedPortNum + "," + expectedHostNameTwo + ":" + expectedPortNum); hiveEnvProperties.put("hive_hostname", expectedHostName); @@ -1683,6 +1684,10 @@ public class BlueprintConfigurationProcessorTest { createExportedAddress(expectedPortNum, expectedHostGroupName) + "," + createExportedAddress(expectedPortNum, expectedHostGroupNameTwo), hiveSiteProperties.get("hive.zookeeper.quorum")); + assertEquals("hive zookeeper connectString property not properly exported", + createExportedAddress(expectedPortNum, expectedHostGroupName) + "," + createExportedAddress(expectedPortNum, expectedHostGroupNameTwo), + hiveSiteProperties.get("hive.cluster.delegation.token.store.zookeeper.connectString")); + mockSupport.verifyAll(); }
