You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/01/29 18:14:12 UTC
ambari git commit: AMBARI-9377. hdfs superuser (usually user 'hdfs')
should be in group dfs.cluster.administrators (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk aa2709676 -> d2af57f63
AMBARI-9377. hdfs superuser (usually user 'hdfs') should be in group dfs.cluster.administrators (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d2af57f6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d2af57f6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d2af57f6
Branch: refs/heads/trunk
Commit: d2af57f63dbd6839eaae1d408e4c2425e8bb58f0
Parents: aa27096
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Jan 29 19:14:06 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Jan 29 19:14:06 2015 +0200
----------------------------------------------------------------------
.../common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml | 3 ++-
.../resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py | 3 +++
.../test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d2af57f6/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
index 8cad375..f64fc76 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml
@@ -326,7 +326,8 @@
<property>
<name>dfs.cluster.administrators</name>
- <value> hdfs</value>
+ <value>hdfs</value>
+ <property-type>GROUP</property-type>
<description>ACL for who all can view the default servlets in the HDFS</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d2af57f6/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
index 3b23204..d8a162a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
@@ -152,6 +152,7 @@ has_oozie_server = not len(oozie_servers) == 0
hbase_tmp_dir = config['configurations']['hbase-site']['hbase.tmp.dir']
proxyuser_group = default("/configurations/hadoop-env/proxyuser_group","users")
+dfs_cluster_administrators_group = config['configurations']['hdfs-site']["dfs.cluster.administrators"]
ignore_groupsusers_create = default("/configurations/cluster-env/ignore_groupsusers_create", False)
@@ -171,6 +172,8 @@ if has_tez:
user_to_groups_dict[tez_user] = [proxyuser_group]
if has_oozie_server:
user_to_groups_dict[oozie_user] = [proxyuser_group]
+if has_namenode:
+ user_to_groups_dict[hdfs_user] = [dfs_cluster_administrators_group]
user_to_gid_dict = collections.defaultdict(lambda:user_group)
http://git-wip-us.apache.org/repos/asf/ambari/blob/d2af57f6/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
index fe36f2e..ca5d789 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
@@ -73,7 +73,7 @@ class TestHookBeforeInstall(RMFTestCase):
self.assertResourceCalled('User', 'hdfs',
gid = 'hadoop',
ignore_failures = False,
- groups = [u'hadoop'],
+ groups = [u' hdfs'],
)
self.assertResourceCalled('User', 'storm',
gid = 'hadoop',