You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/06/11 10:00:14 UTC
ambari git commit: AMBARI-11595: Update Falcon DR directory ownership
(jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 012519fa4 -> a5b005377
AMBARI-11595: Update Falcon DR directory ownership (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a5b00537
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a5b00537
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a5b00537
Branch: refs/heads/trunk
Commit: a5b0053778448c97765100149373363df438cf85
Parents: 012519f
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Thu Jun 11 01:00:09 2015 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Thu Jun 11 01:00:09 2015 -0700
----------------------------------------------------------------------
.../common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py | 2 +-
.../stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py | 5 +++++
.../python/stacks/2.0.6/hooks/before-ANY/test_before_any.py | 2 +-
.../src/test/python/stacks/2.1/FALCON/test_falcon_server.py | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a5b00537/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
index db93e7d..38c806b 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/falcon.py
@@ -134,7 +134,7 @@ def falcon(type, action = None):
type = "directory",
action = "create_on_execute",
owner = params.falcon_user,
- group = params.user_group,
+ group = params.proxyuser_group,
recursive_chown = True,
recursive_chmod = True,
mode = 0770,
http://git-wip-us.apache.org/repos/asf/ambari/blob/a5b00537/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 4f67f07..1c7b2b7 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
@@ -150,6 +150,7 @@ gmetad_user = config['configurations']['ganglia-env']["gmetad_user"]
gmond_user = config['configurations']['ganglia-env']["gmond_user"]
tez_user = config['configurations']['tez-env']["tez_user"]
oozie_user = config['configurations']['oozie-env']["oozie_user"]
+falcon_user = config['configurations']['falcon-env']["falcon_user"]
user_group = config['configurations']['cluster-env']['user_group']
@@ -157,12 +158,14 @@ ganglia_server_hosts = default("/clusterHostInfo/ganglia_server_host", [])
namenode_host = default("/clusterHostInfo/namenode_host", [])
hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", [])
oozie_servers = default("/clusterHostInfo/oozie_server", [])
+falcon_server_hosts = default("/clusterHostInfo/falcon_server_hosts", [])
has_namenode = not len(namenode_host) == 0
has_ganglia_server = not len(ganglia_server_hosts) == 0
has_tez = 'tez-site' in config['configurations']
has_hbase_masters = not len(hbase_master_hosts) == 0
has_oozie_server = not len(oozie_servers) == 0
+has_falcon_server_hosts = not len(falcon_server_hosts) == 0
hbase_tmp_dir = "/tmp/hbase-hbase"
@@ -187,6 +190,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_falcon_server_hosts:
+ user_to_groups_dict[falcon_user] = [proxyuser_group]
user_to_gid_dict = collections.defaultdict(lambda:user_group)
http://git-wip-us.apache.org/repos/asf/ambari/blob/a5b00537/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 fb4a937..129907f 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
@@ -114,7 +114,7 @@ class TestHookBeforeInstall(RMFTestCase):
self.assertResourceCalled('User', 'falcon',
gid = 'hadoop',
ignore_failures = False,
- groups = [u'hadoop'],
+ groups = [u'users'],
)
self.assertResourceCalled('User', 'sqoop',
gid = 'hadoop',
http://git-wip-us.apache.org/repos/asf/ambari/blob/a5b00537/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
index e7e0345..521f4a6 100644
--- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
+++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
@@ -148,7 +148,7 @@ class TestFalconServer(RMFTestCase):
kinit_path_local = '/usr/bin/kinit',
user = 'hdfs',
owner = 'falcon',
- group='hadoop',
+ group='users',
hadoop_conf_dir = '/etc/hadoop/conf',
type = 'directory',
recursive_chown = True,