Repository: ambari Updated Branches: refs/heads/branch-2.1 d6645794e -> 4dadeb9fe refs/heads/trunk a6c6faf2b -> 6eb636211
AMBARI-13368. 'chmod -R 755' should be executed against Nodemanager local dirs (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6eb63621 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6eb63621 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6eb63621 Branch: refs/heads/trunk Commit: 6eb63621183a45e084fee458e431644967dd5c2d Parents: a6c6faf Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Fri Oct 9 12:20:38 2015 +0300 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Fri Oct 9 12:20:38 2015 +0300 ---------------------------------------------------------------------- .../YARN/2.1.0.2.0/package/scripts/params_linux.py | 3 +++ .../common-services/YARN/2.1.0.2.0/package/scripts/yarn.py | 7 +++++-- .../src/test/python/stacks/2.0.6/YARN/test_nodemanager.py | 7 ++++++- 3 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6eb63621/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py index 6905587..ba65fbc 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py @@ -170,6 +170,9 @@ if hostname and nm_address and nm_address.startswith("0.0.0.0:"): nm_local_dirs = config['configurations']['yarn-site']['yarn.nodemanager.local-dirs'] nm_log_dirs = config['configurations']['yarn-site']['yarn.nodemanager.log-dirs'] +nm_local_dirs_list = nm_local_dirs.split(',') +nm_log_dirs_list = nm_log_dirs.split(',') + distrAppJarName = "hadoop-yarn-applications-distributedshell-2.*.jar" hadoopMapredExamplesJarName = "hadoop-mapreduce-examples-2.*.jar" http://git-wip-us.apache.org/repos/asf/ambari/blob/6eb63621/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 a00378b..4d5cb9b 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 @@ -104,7 +104,7 @@ def yarn(name = None): # First start after enabling/disabling security if params.toggle_nm_security: - Directory(params.nm_local_dirs.split(',') + params.nm_log_dirs.split(','), + Directory(params.nm_local_dirs_list + params.nm_log_dirs_list, action='delete' ) @@ -125,7 +125,7 @@ def yarn(name = None): if not params.security_enabled or params.toggle_nm_security: - Directory(params.nm_local_dirs.split(',') + params.nm_log_dirs.split(','), + Directory(params.nm_local_dirs_list + params.nm_log_dirs_list, owner=params.yarn_user, group=params.user_group, recursive=True, @@ -133,6 +133,9 @@ def yarn(name = None): ignore_failures=True, mode=0775 ) + Execute(("chmod", "-R", "755") + tuple(params.nm_local_dirs_list), + sudo=True, + ) if params.yarn_nodemanager_recovery_dir: Directory(InlineTemplate(params.yarn_nodemanager_recovery_dir).get_content(), http://git-wip-us.apache.org/repos/asf/ambari/blob/6eb63621/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 0542dea..e7da747 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,6 +167,9 @@ class TestNodeManager(RMFTestCase): mode = 0775, cd_access='a' ) + self.assertResourceCalled('Execute', ('chmod', '-R', '755', u'/hadoop/yarn/local', u'/hadoop/yarn/local1'), + sudo = True, + ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', owner = 'yarn', group = 'hadoop', @@ -349,7 +352,9 @@ class TestNodeManager(RMFTestCase): mode = 0775, cd_access='a' ) - + self.assertResourceCalled('Execute', ('chmod', '-R', '755', u'/hadoop/yarn/local'), + sudo = True, + ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn', owner = 'yarn', group = 'hadoop',