Repository: ambari Updated Branches: refs/heads/trunk 1531a7edc -> cc07fbe75
AMBARI-5094. yarn.exclude FileNotFoundException during RM startup (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f58c6364 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f58c6364 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f58c6364 Branch: refs/heads/trunk Commit: f58c63645316c30f6ec9728ebab6083a307a0898 Parents: 1531a7e Author: Andrew Onischuk <[email protected]> Authored: Sun Mar 16 12:45:09 2014 -0700 Committer: Andrew Onischuk <[email protected]> Committed: Sun Mar 16 12:45:09 2014 -0700 ---------------------------------------------------------------------- .../HDP/2.0.6/services/YARN/package/scripts/params.py | 2 +- .../HDP/2.0.6/services/YARN/package/scripts/yarn.py | 5 +++++ .../test/python/stacks/2.0.6/YARN/test_historyserver.py | 8 ++++++++ .../python/stacks/2.0.6/YARN/test_mapreduce2_client.py | 8 ++++++++ .../test/python/stacks/2.0.6/YARN/test_nodemanager.py | 8 ++++++++ .../python/stacks/2.0.6/YARN/test_resourcemanager.py | 8 ++++++++ .../test/python/stacks/2.0.6/YARN/test_yarn_client.py | 12 ++++++++++++ .../python/stacks/2.1/YARN/test_apptimelineserver.py | 4 ++++ 8 files changed, 54 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f58c6364/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py index 9d69013..a523a4f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py @@ -41,6 +41,7 @@ kinit_path_local = functions.get_kinit_path([default("kinit_path_local",None), " rm_host = config['clusterHostInfo']['rm_host'][0] rm_port = config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'].split(':')[-1] rm_https_port = "8090" +rm_nodes_exclude_path = config['configurations']['yarn-site']['yarn.resourcemanager.nodes.exclude-path'] java64_home = config['hostLevelParams']['java_home'] hadoop_ssl_enabled = default("/configurations/core-site/hadoop.ssl.enabled", False) @@ -51,7 +52,6 @@ yarn_heapsize = config['configurations']['global']['yarn_heapsize'] resourcemanager_heapsize = config['configurations']['global']['resourcemanager_heapsize'] nodemanager_heapsize = config['configurations']['global']['nodemanager_heapsize'] apptimelineserver_heapsize = default("/configurations/global/apptimelineserver_heapsize", 1024) - yarn_log_dir_prefix = config['configurations']['global']['yarn_log_dir_prefix'] yarn_pid_dir_prefix = status_params.yarn_pid_dir_prefix mapred_pid_dir_prefix = status_params.mapred_pid_dir_prefix http://git-wip-us.apache.org/repos/asf/ambari/blob/f58c6364/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 108eb89..aa7f139 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 @@ -121,6 +121,11 @@ def yarn(name = None): group=params.user_group ) + File(params.rm_nodes_exclude_path, + owner=params.yarn_user, + group=params.user_group + ) + File(params.mapred_job_summary_log, owner=params.mapred_user, group=params.user_group http://git-wip-us.apache.org/repos/asf/ambari/blob/f58c6364/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 98bc3a6..5c924f8 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 @@ -242,6 +242,10 @@ class TestHistoryServer(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', + owner = 'yarn', + group = 'hadoop', + ) self.assertResourceCalled('File', '/var/log/hadoop-mapreduce/mapred/hadoop-mapreduce.jobsummary.log', owner = 'mapred', group = 'hadoop', @@ -386,6 +390,10 @@ class TestHistoryServer(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', + owner = 'yarn', + group = 'hadoop', + ) self.assertResourceCalled('File', '/var/log/hadoop-mapreduce/mapred/hadoop-mapreduce.jobsummary.log', owner = 'mapred', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/f58c6364/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 ef5c05f..e376850 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 @@ -101,6 +101,10 @@ class TestMapReduce2Client(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', + owner = 'yarn', + group = 'hadoop', + ) self.assertResourceCalled('File', '/var/log/hadoop-mapreduce/mapred/hadoop-mapreduce.jobsummary.log', owner = 'mapred', group = 'hadoop', @@ -192,6 +196,10 @@ class TestMapReduce2Client(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', + owner = 'yarn', + group = 'hadoop', + ) self.assertResourceCalled('File', '/var/log/hadoop-mapreduce/mapred/hadoop-mapreduce.jobsummary.log', owner = 'mapred', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/f58c6364/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 a28a47e..8e24f7a 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 @@ -242,6 +242,10 @@ class TestNodeManager(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', + owner = 'yarn', + group = 'hadoop', + ) self.assertResourceCalled('File', '/var/log/hadoop-mapreduce/mapred/hadoop-mapreduce.jobsummary.log', owner = 'mapred', group = 'hadoop', @@ -386,6 +390,10 @@ class TestNodeManager(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', + owner = 'yarn', + group = 'hadoop', + ) self.assertResourceCalled('File', '/var/log/hadoop-mapreduce/mapred/hadoop-mapreduce.jobsummary.log', owner = 'mapred', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/f58c6364/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 f8ff29e..ca870c0 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 @@ -182,6 +182,10 @@ class TestResourceManager(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', + owner = 'yarn', + group = 'hadoop', + ) self.assertResourceCalled('File', '/var/log/hadoop-mapreduce/mapred/hadoop-mapreduce.jobsummary.log', owner = 'mapred', group = 'hadoop', @@ -267,6 +271,10 @@ class TestResourceManager(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', + owner = 'yarn', + group = 'hadoop', + ) self.assertResourceCalled('File', '/var/log/hadoop-mapreduce/mapred/hadoop-mapreduce.jobsummary.log', owner = 'mapred', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/f58c6364/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 59ac114..f57f055 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 @@ -102,6 +102,10 @@ class TestYarnClient(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', + owner = 'yarn', + group = 'hadoop', + ) self.assertResourceCalled('File', '/var/log/hadoop-mapreduce/mapred/hadoop-mapreduce.jobsummary.log', owner = 'mapred', group = 'hadoop', @@ -193,6 +197,10 @@ class TestYarnClient(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', + owner = 'yarn', + group = 'hadoop', + ) self.assertResourceCalled('File', '/var/log/hadoop-mapreduce/mapred/hadoop-mapreduce.jobsummary.log', owner = 'mapred', group = 'hadoop', @@ -302,6 +310,10 @@ class TestYarnClient(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', + owner = 'yarn', + group = 'hadoop', + ) self.assertResourceCalled('File', '/var/log/hadoop-mapreduce/mapred/hadoop-mapreduce.jobsummary.log', owner = 'mapred', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/f58c6364/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 fc1f547..233c57d 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 @@ -136,6 +136,10 @@ class TestAppTimelineServer(RMFTestCase): owner = 'yarn', group = 'hadoop', ) + self.assertResourceCalled('File', '/etc/hadoop/conf/yarn.exclude', + owner = 'yarn', + group = 'hadoop', + ) self.assertResourceCalled('File', '/var/log/hadoop-mapreduce/mapred/hadoop-mapreduce.jobsummary.log', owner = 'mapred', group = 'hadoop',
