ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnettle...@apache.org
Subject ambari git commit: AMBARI-14026. Blueprints not setting correct defaults for HDFS proxyuser group settings. (rnettleton)
Date Tue, 24 Nov 2015 16:35:37 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk b227b1376 -> 944b8edb0


AMBARI-14026. Blueprints not setting correct defaults for HDFS proxyuser group settings. (rnettleton)


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

Branch: refs/heads/trunk
Commit: 944b8edb09522e2fb13de8e8d72e586efab85977
Parents: b227b13
Author: Bob Nettleton <rnettleton@hortonworks.com>
Authored: Tue Nov 24 11:34:32 2015 -0500
Committer: Bob Nettleton <rnettleton@hortonworks.com>
Committed: Tue Nov 24 11:35:08 2015 -0500

----------------------------------------------------------------------
 .../BlueprintConfigurationProcessor.java        |  2 +-
 .../BlueprintConfigurationProcessorTest.java    | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/944b8edb/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 0138894..7f11bb9 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
@@ -2365,7 +2365,7 @@ public class BlueprintConfigurationProcessor {
         String user = configs.get(property);
         if (user != null && !user.isEmpty()) {
           ensureProperty(configuration, "core-site", String.format(proxyUserHosts, user),
"*", configTypesUpdated);
-          ensureProperty(configuration, "core-site", String.format(proxyUserGroups, user),
"users", configTypesUpdated);
+          ensureProperty(configuration, "core-site", String.format(proxyUserGroups, user),
"*", configTypesUpdated);
         }
       } else {
         LOG.debug("setMissingConfigurations: no user configuration found for type = " + configType
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/944b8edb/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 c0a6fbc..17c0157 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
@@ -5047,19 +5047,19 @@ public class BlueprintConfigurationProcessorTest {
     configProcessor.doUpdateForClusterCreate();
 
     assertEquals("*", properties.get("core-site").get("hadoop.proxyuser.test-oozie-user.hosts"));
-    assertEquals("users", properties.get("core-site").get("hadoop.proxyuser.test-oozie-user.groups"));
+    assertEquals("*", properties.get("core-site").get("hadoop.proxyuser.test-oozie-user.groups"));
 
     assertEquals("*", properties.get("core-site").get("hadoop.proxyuser.test-hive-user.hosts"));
-    assertEquals("users", properties.get("core-site").get("hadoop.proxyuser.test-hive-user.groups"));
+    assertEquals("*", properties.get("core-site").get("hadoop.proxyuser.test-hive-user.groups"));
 
     assertEquals("*", properties.get("core-site").get("hadoop.proxyuser.test-hcat-user.hosts"));
-    assertEquals("users", properties.get("core-site").get("hadoop.proxyuser.test-hcat-user.groups"));
+    assertEquals("*", properties.get("core-site").get("hadoop.proxyuser.test-hcat-user.groups"));
 
     assertEquals("*", properties.get("core-site").get("hadoop.proxyuser.test-hbase-user.hosts"));
-    assertEquals("users", properties.get("core-site").get("hadoop.proxyuser.test-hbase-user.groups"));
+    assertEquals("*", properties.get("core-site").get("hadoop.proxyuser.test-hbase-user.groups"));
 
     assertEquals("*", properties.get("core-site").get("hadoop.proxyuser.test-falcon-user.hosts"));
-    assertEquals("users", properties.get("core-site").get("hadoop.proxyuser.test-falcon-user.groups"));
+    assertEquals("*", properties.get("core-site").get("hadoop.proxyuser.test-falcon-user.groups"));
   }
 
   @Test
@@ -5094,10 +5094,10 @@ public class BlueprintConfigurationProcessorTest {
     assertEquals(4, coreSiteProperties.size());
 
     assertEquals("*", coreSiteProperties.get("hadoop.proxyuser.test-oozie-user.hosts"));
-    assertEquals("users", coreSiteProperties.get("hadoop.proxyuser.test-oozie-user.groups"));
+    assertEquals("*", coreSiteProperties.get("hadoop.proxyuser.test-oozie-user.groups"));
 
     assertEquals("*", coreSiteProperties.get("hadoop.proxyuser.test-falcon-user.hosts"));
-    assertEquals("users", coreSiteProperties.get("hadoop.proxyuser.test-falcon-user.groups"));
+    assertEquals("*", coreSiteProperties.get("hadoop.proxyuser.test-falcon-user.groups"));
   }
 
   @Test
@@ -5139,7 +5139,7 @@ public class BlueprintConfigurationProcessorTest {
     assertEquals("testOozieGroupsVal", coreSiteProperties.get("hadoop.proxyuser.test-oozie-user.groups"));
 
     assertEquals("*", coreSiteProperties.get("hadoop.proxyuser.test-falcon-user.hosts"));
-    assertEquals("users", coreSiteProperties.get("hadoop.proxyuser.test-falcon-user.groups"));
+    assertEquals("*", coreSiteProperties.get("hadoop.proxyuser.test-falcon-user.groups"));
   }
 
   @Test
@@ -5182,10 +5182,10 @@ public class BlueprintConfigurationProcessorTest {
     // ensure that explicitly set value is unchanged
     assertEquals("testOozieHostsVal", clusterConfig.getPropertyValue("core-site", "hadoop.proxyuser.test-oozie-user.hosts"));
 
-    assertEquals("users", leafConfigCoreSiteProps.get("hadoop.proxyuser.test-oozie-user.groups"));
+    assertEquals("*", leafConfigCoreSiteProps.get("hadoop.proxyuser.test-oozie-user.groups"));
 
     assertEquals("*", leafConfigCoreSiteProps.get("hadoop.proxyuser.test-falcon-user.hosts"));
-    assertEquals("users", leafConfigCoreSiteProps.get("hadoop.proxyuser.test-falcon-user.groups"));
+    assertEquals("*", leafConfigCoreSiteProps.get("hadoop.proxyuser.test-falcon-user.groups"));
   }
 
   @Test


Mime
View raw message