AMBARI-7599. Ambari create yarn.nodemanager.local-dirs on all the nodes that has yarn client installed. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d69a418f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d69a418f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d69a418f Branch: refs/heads/branch-alerts-dev Commit: d69a418ff690ee78295eeec0a3d7c989551d425f Parents: d1c6476 Author: Myroslav Papirkovskyy <[email protected]> Authored: Wed Oct 1 21:49:23 2014 +0300 Committer: Myroslav Papirkovskyy <[email protected]> Committed: Fri Oct 3 16:18:50 2014 +0300 ---------------------------------------------------------------------- .../0.8/services/YARN/package/scripts/yarn.py | 9 ++- .../services/YARN/package/scripts/yarn.py | 19 ++++--- .../2.0.6/services/YARN/package/scripts/yarn.py | 9 ++- .../services/YARN/package/scripts/yarn.py | 19 ++++--- .../stacks/2.0.6/YARN/test_historyserver.py | 30 ---------- .../stacks/2.0.6/YARN/test_mapreduce2_client.py | 30 ---------- .../stacks/2.0.6/YARN/test_nodemanager.py | 60 ++++++++++---------- .../stacks/2.0.6/YARN/test_resourcemanager.py | 30 ---------- .../stacks/2.0.6/YARN/test_yarn_client.py | 50 ---------------- .../stacks/2.1/YARN/test_apptimelineserver.py | 20 ------- 10 files changed, 68 insertions(+), 208 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d69a418f/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/package/scripts/yarn.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/package/scripts/yarn.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/package/scripts/yarn.py index 6aff622..d5b413e 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/package/scripts/yarn.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/package/scripts/yarn.py @@ -60,6 +60,13 @@ def yarn(name = None): ) params.HdfsDirectory(None, action="create") + if name == "nodemanager": + Directory(params.nm_local_dirs.split(',') + params.nm_log_dirs.split(','), + owner=params.yarn_user, + recursive=True, + ignore_failures=True, + ) + Directory([params.yarn_pid_dir, params.yarn_log_dir], owner=params.yarn_user, group=params.user_group, @@ -71,7 +78,7 @@ def yarn(name = None): group=params.user_group, recursive=True ) - Directory(params.nm_local_dirs.split(',')+params.nm_log_dirs.split(',')+[params.yarn_log_dir_prefix], + Directory([params.yarn_log_dir_prefix], owner=params.yarn_user, recursive=True, ignore_failures=True, http://git-wip-us.apache.org/repos/asf/ambari/blob/d69a418f/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/package/scripts/yarn.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/package/scripts/yarn.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/package/scripts/yarn.py index 48f32d2..8754605 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/package/scripts/yarn.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/package/scripts/yarn.py @@ -59,6 +59,16 @@ def yarn(name = None): ) params.HdfsDirectory(None, action="create") + if name == "nodemanager": + Directory(params.nm_local_dirs.split(','), + owner=params.yarn_user, + recursive=True + ) + Directory(params.nm_log_dirs.split(','), + owner=params.yarn_user, + recursive=True + ) + Directory([params.yarn_pid_dir, params.yarn_log_dir], owner=params.yarn_user, group=params.user_group, @@ -70,14 +80,7 @@ def yarn(name = None): group=params.user_group, recursive=True ) - Directory(params.nm_local_dirs.split(','), - owner=params.yarn_user, - recursive=True - ) - Directory(params.nm_log_dirs.split(','), - owner=params.yarn_user, - recursive=True - ) + Directory(params.yarn_log_dir_prefix, owner=params.yarn_user, recursive=True http://git-wip-us.apache.org/repos/asf/ambari/blob/d69a418f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py index 83e40c6..df3a9d2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/yarn.py @@ -60,6 +60,13 @@ def yarn(name = None): ) params.HdfsDirectory(None, action="create") + if name == "nodemanager": + Directory(params.nm_local_dirs.split(',') + params.nm_log_dirs.split(','), + owner=params.yarn_user, + recursive=True, + ignore_failures=True, + ) + Directory([params.yarn_pid_dir, params.yarn_log_dir], owner=params.yarn_user, group=params.user_group, @@ -71,7 +78,7 @@ def yarn(name = None): group=params.user_group, recursive=True ) - Directory(params.nm_local_dirs.split(',')+params.nm_log_dirs.split(',')+[params.yarn_log_dir_prefix], + Directory([params.yarn_log_dir_prefix], owner=params.yarn_user, recursive=True, ignore_failures=True, http://git-wip-us.apache.org/repos/asf/ambari/blob/d69a418f/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/package/scripts/yarn.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/package/scripts/yarn.py b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/package/scripts/yarn.py index 48f32d2..8754605 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/package/scripts/yarn.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/package/scripts/yarn.py @@ -59,6 +59,16 @@ def yarn(name = None): ) params.HdfsDirectory(None, action="create") + if name == "nodemanager": + Directory(params.nm_local_dirs.split(','), + owner=params.yarn_user, + recursive=True + ) + Directory(params.nm_log_dirs.split(','), + owner=params.yarn_user, + recursive=True + ) + Directory([params.yarn_pid_dir, params.yarn_log_dir], owner=params.yarn_user, group=params.user_group, @@ -70,14 +80,7 @@ def yarn(name = None): group=params.user_group, recursive=True ) - Directory(params.nm_local_dirs.split(','), - owner=params.yarn_user, - recursive=True - ) - Directory(params.nm_log_dirs.split(','), - owner=params.yarn_user, - recursive=True - ) + Directory(params.yarn_log_dir_prefix, owner=params.yarn_user, recursive=True http://git-wip-us.apache.org/repos/asf/ambari/blob/d69a418f/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py index 738ffc1..050b3e6 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py @@ -199,26 +199,6 @@ class TestHistoryServer(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', recursive = True, @@ -396,16 +376,6 @@ class TestHistoryServer(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', recursive = True, http://git-wip-us.apache.org/repos/asf/ambari/blob/d69a418f/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py index 4218a59..05882b6 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_mapreduce2_client.py @@ -54,26 +54,6 @@ class TestMapReduce2Client(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', recursive = True, @@ -192,16 +172,6 @@ class TestMapReduce2Client(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', recursive = True, http://git-wip-us.apache.org/repos/asf/ambari/blob/d69a418f/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 5f15d91..b70c9e5 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 @@ -176,6 +176,26 @@ class TestNodeManager(RMFTestCase): bin_dir = '/usr/bin', action = ['create'], ) + self.assertResourceCalled('Directory', '/hadoop/yarn/local', + owner = 'yarn', + recursive = True, + ignore_failures = True, + ) + self.assertResourceCalled('Directory', '/hadoop/yarn/local1', + owner = 'yarn', + recursive = True, + ignore_failures = True, + ) + self.assertResourceCalled('Directory', '/hadoop/yarn/log', + owner = 'yarn', + recursive = True, + ignore_failures = True, + ) + self.assertResourceCalled('Directory', '/hadoop/yarn/log1', + owner = 'yarn', + recursive = True, + ignore_failures = True, + ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', @@ -196,26 +216,6 @@ class TestNodeManager(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', recursive = True, @@ -373,6 +373,16 @@ class TestNodeManager(RMFTestCase): kinit_path_local = '/usr/bin/kinit', action = ['create'], ) + self.assertResourceCalled('Directory', '/hadoop/yarn/local', + owner = 'yarn', + recursive = True, + ignore_failures = True, + ) + self.assertResourceCalled('Directory', '/hadoop/yarn/log', + owner = 'yarn', + recursive = True, + ignore_failures = True, + ) self.assertResourceCalled('Directory', '/var/run/hadoop-yarn/yarn', owner = 'yarn', group = 'hadoop', @@ -393,16 +403,6 @@ class TestNodeManager(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', recursive = True, http://git-wip-us.apache.org/repos/asf/ambari/blob/d69a418f/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py index 69f53c2..6f7f286 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py @@ -169,26 +169,6 @@ class TestResourceManager(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', recursive = True, @@ -305,16 +285,6 @@ class TestResourceManager(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', recursive = True, http://git-wip-us.apache.org/repos/asf/ambari/blob/d69a418f/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py index 032f334..d19b263 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_yarn_client.py @@ -55,26 +55,6 @@ class TestYarnClient(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', recursive = True, @@ -193,16 +173,6 @@ class TestYarnClient(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', recursive = True, @@ -338,26 +308,6 @@ class TestYarnClient(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', recursive = True, http://git-wip-us.apache.org/repos/asf/ambari/blob/d69a418f/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py index 89019ba..0239cf3 100644 --- a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py +++ b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py @@ -95,26 +95,6 @@ class TestAppTimelineServer(RMFTestCase): group = 'hadoop', recursive = True, ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/local1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) - self.assertResourceCalled('Directory', '/hadoop/yarn/log1', - owner = 'yarn', - recursive = True, - ignore_failures = True, - ) self.assertResourceCalled('Directory', '/var/log/hadoop-yarn', owner = 'yarn', recursive = True,
