ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [44/49] ambari git commit: AMBARI-19700. When hiveserver2 LDAP authentication is enabled hive.server2.authentication.ldap.url property gets exported with hardcoded hostname. (Amruta Borkar via rnettleton)
Date Fri, 27 Jan 2017 18:17:55 GMT
AMBARI-19700. When hiveserver2 LDAP authentication is enabled hive.server2.authentication.ldap.url
property gets exported with hardcoded hostname. (Amruta Borkar via rnettleton)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ad195c25
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ad195c25
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ad195c25

Branch: refs/heads/branch-dev-patch-upgrade
Commit: ad195c25df7360dde9d18348d3db0bb9e212a4b4
Parents: fb95138
Author: Bob Nettleton <rnettleton@hortonworks.com>
Authored: Fri Jan 27 10:43:32 2017 -0500
Committer: Bob Nettleton <rnettleton@hortonworks.com>
Committed: Fri Jan 27 10:43:32 2017 -0500

----------------------------------------------------------------------
 .../controller/internal/BlueprintConfigurationProcessor.java      | 1 +
 .../controller/internal/BlueprintConfigurationProcessorTest.java  | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ad195c25/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 25d6145..d4880b9 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
@@ -2488,6 +2488,7 @@ public class BlueprintConfigurationProcessor {
     yarnSiteMap.put("yarn.timeline-service.webapp.https.address", new SingleHostTopologyUpdater("APP_TIMELINE_SERVER"));
 
     // HIVE_SERVER
+    hiveSiteMap.put("hive.server2.authentication.ldap.url", new SingleHostTopologyUpdater("HIVE_SERVER2"));
     multiHiveSiteMap.put("hive.metastore.uris", new MultipleHostTopologyUpdater("HIVE_METASTORE",
',', true, true, true));
     dbHiveSiteMap.put("javax.jdo.option.ConnectionURL",
         new DBTopologyUpdater("MYSQL_SERVER", "hive-env", "hive_database"));

http://git-wip-us.apache.org/repos/asf/ambari/blob/ad195c25/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 0ad0351..928d1e0 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
@@ -1571,6 +1571,7 @@ public class BlueprintConfigurationProcessorTest {
 
     // setup properties that include host information
     hiveSiteProperties.put("hive.metastore.uris", "thrift://" + expectedHostName + ":" +
expectedPortNum + "," + "thrift://" + expectedHostNameTwo + ":" + expectedPortNum);
+    hiveSiteProperties.put("hive.server2.authentication.ldap.url", "ldap://myexternalhost.com:1389");
     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);
@@ -1624,6 +1625,8 @@ public class BlueprintConfigurationProcessorTest {
     assertEquals("hive property not properly exported",
         createExportedHostName(expectedHostGroupName) + "," + createExportedHostName(expectedHostGroupNameTwo),
coreSiteProperties.get("hadoop.proxyuser.hive.hosts"));
 
+    assertFalse("hive.server2.authentication.ldap.url should not have been present in the
exported configuration",
+        hiveSiteProperties.containsKey("hive.server2.authentication.ldap.url"));
     assertEquals("hive property not properly exported",
       createExportedHostName(expectedHostGroupName) + "," + createExportedHostName(expectedHostGroupNameTwo),
coreSiteProperties.get("hadoop.proxyuser.HTTP.hosts"));
 


Mime
View raw message