You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2015/01/28 18:53:24 UTC
ambari git commit: AMBARI-9372. Kerberos: start + test fails on
NodeManager due to ambari-qa usercache (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk 9c1e3a9d7 -> 6b0e4a90c
AMBARI-9372. Kerberos: start + test fails on NodeManager due to ambari-qa usercache (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6b0e4a90
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6b0e4a90
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6b0e4a90
Branch: refs/heads/trunk
Commit: 6b0e4a90cde498d47789353134157190025b288b
Parents: 9c1e3a9
Author: Robert Levas <rl...@hortonworks.com>
Authored: Wed Jan 28 12:53:15 2015 -0500
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Wed Jan 28 12:53:20 2015 -0500
----------------------------------------------------------------------
.../common-services/YARN/2.1.0.2.0/package/scripts/yarn.py | 3 ++-
.../src/test/python/stacks/2.0.6/YARN/test_nodemanager.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b0e4a90/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 4ae649c..10012b2 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
@@ -74,7 +74,8 @@ def yarn(name = None):
smokeuser_directories = [os.path.join(dir, 'usercache' ,params.smokeuser)
for dir in params.nm_local_dirs.split(',')]
for directory in smokeuser_directories:
- Execute(format("chown -R {params.smokeuser} {directory}"))
+ Execute(format("chown -R {params.smokeuser} {directory}"),
+ only_if=format("test -d {directory}"))
Directory([params.yarn_pid_dir_prefix, params.yarn_pid_dir, params.yarn_log_dir],
owner=params.yarn_user,
group=params.user_group,
http://git-wip-us.apache.org/repos/asf/ambari/blob/6b0e4a90/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 d852ad1..a3c88d3 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
@@ -438,7 +438,8 @@ class TestNodeManager(RMFTestCase):
mode = 0775,
cd_access='a'
)
- self.assertResourceCalled('Execute', 'chown -R ambari-qa /hadoop/yarn/local/usercache/ambari-qa')
+ self.assertResourceCalled('Execute', 'chown -R ambari-qa /hadoop/yarn/local/usercache/ambari-qa',
+ only_if = 'test -d /hadoop/yarn/local/usercache/ambari-qa')
self.assertResourceCalled('Directory', '/var/run/hadoop-yarn',
owner = 'yarn',
group = 'hadoop',