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/06/06 16:02:05 UTC
[2/2] ambari git commit: AMBARI-11754. YARN local usercache is
chown'd as user YARN when cluster is in secure mode (aonishuk)
AMBARI-11754. YARN local usercache is chown'd as user YARN when cluster is in secure mode (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8c663f5a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8c663f5a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8c663f5a
Branch: refs/heads/branch-2.1
Commit: 8c663f5ae570adf1a3b9e4994c497b6badd63b35
Parents: 7cb5bcd
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Sat Jun 6 17:01:50 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Sat Jun 6 17:01:50 2015 +0300
----------------------------------------------------------------------
.../YARN/2.1.0.2.0/package/scripts/yarn.py | 11 +++++++----
.../test/python/stacks/2.0.6/YARN/test_nodemanager.py | 12 ++++++------
2 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8c663f5a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
index e3019eb..197bb80 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
@@ -101,14 +101,17 @@ def yarn(name = None):
mode=0775
)
- Execute(('chown', '-R', params.yarn_user, params.nm_local_dirs),
- only_if=format("test -d {nm_local_dirs}"),
+ smokeuser_directories = [os.path.join(dir, 'usercache' ,params.smokeuser)
+ for dir in params.nm_local_dirs.split(',')]
+
+ if not params.security_enabled:
+ for directory in smokeuser_directories:
+ Execute(('chown', '-R', params.yarn_user, directory),
+ only_if=format("test -d {directory}"),
sudo=True)
if params.security_enabled:
- smokeuser_directories = [os.path.join(dir, 'usercache' ,params.smokeuser)
- for dir in params.nm_local_dirs.split(',')]
for directory in smokeuser_directories:
Execute(('chown', '-R', params.smokeuser, directory),
only_if=format("test -d {directory}"),
http://git-wip-us.apache.org/repos/asf/ambari/blob/8c663f5a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
index 2b14923..52be93e 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
@@ -167,11 +167,15 @@ class TestNodeManager(RMFTestCase):
mode = 0775,
cd_access='a'
)
- self.assertResourceCalled('Execute', ('chown', '-R', u'yarn', u'/hadoop/yarn/local,/hadoop/yarn/local1'),
+ self.assertResourceCalled('Execute', ('chown', '-R', u'yarn', u'/hadoop/yarn/local/usercache/ambari-qa'),
sudo = True,
- only_if = 'test -d /hadoop/yarn/local,/hadoop/yarn/local1',
+ only_if = 'test -d /hadoop/yarn/local/usercache/ambari-qa',
)
+ self.assertResourceCalled('Execute', ('chown', '-R', u'yarn', u'/hadoop/yarn/local1/usercache/ambari-qa'),
+ sudo = True,
+ only_if = 'test -d /hadoop/yarn/local1/usercache/ambari-qa',
+ )
self.assertResourceCalled('Directory', '/var/run/hadoop-yarn',
owner = 'yarn',
group = 'hadoop',
@@ -337,10 +341,6 @@ class TestNodeManager(RMFTestCase):
mode = 0775,
cd_access='a'
)
- self.assertResourceCalled('Execute', ('chown', '-R', u'yarn', u'/hadoop/yarn/local'),
- sudo = True,
- only_if = 'test -d /hadoop/yarn/local',
- )
self.assertResourceCalled('Execute', ('chown', '-R', u'ambari-qa', u'/hadoop/yarn/local/usercache/ambari-qa'),
sudo = True,