AMBARI-18139. Oozie service check fails if set yarn.resourcemanager.address to the default from yarn-default.xml (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/755c5eab Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/755c5eab Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/755c5eab Branch: refs/heads/trunk Commit: 755c5eabc8eee9f8bd051efa340d8b56789984e8 Parents: 7a6f710 Author: Lisnichenko Dmitro <[email protected]> Authored: Fri Aug 12 19:53:05 2016 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Fri Aug 12 19:54:08 2016 +0300 ---------------------------------------------------------------------- .../OOZIE/4.0.0.2.0/package/scripts/service_check.py | 2 +- .../src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py | 2 +- .../src/test/python/stacks/2.0.6/OOZIE/test_service_check.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/755c5eab/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py index 45ffca2..49fc129 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/service_check.py @@ -76,7 +76,7 @@ class OozieServiceCheckDefault(OozieServiceCheck): os_family = System.get_instance().os_family oozie_examples_dir = glob.glob(params.oozie_examples_regex)[0] - Execute(format("{tmp_dir}/{prepare_hdfs_file_name} {conf_dir} {oozie_examples_dir} {hadoop_conf_dir} {yarn_resourcemanager_address} {fs_root} {service_check_queue_name}"), + Execute((format("{tmp_dir}/{prepare_hdfs_file_name}"), params.conf_dir, oozie_examples_dir, params.hadoop_conf_dir, params.yarn_resourcemanager_address, params.fs_root, params.service_check_queue_name), tries=3, try_sleep=5, logoutput=True http://git-wip-us.apache.org/repos/asf/ambari/blob/755c5eab/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py index 438539f..22d7d63 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_service_check.py @@ -72,7 +72,7 @@ class TestOozieServiceCheck(RMFTestCase): mode = 0755) self.assertResourceCalled('Execute', - "/tmp/prepareOozieHdfsDirectories.sh /usr/hdp/current/oozie-client/conf examples-dir /usr/hdp/current/hadoop-client/conf c6402.ambari.apache.org:8050 hdfs://c6401.ambari.apache.org:8020 default", + ('/tmp/prepareOozieHdfsDirectories.sh', '/usr/hdp/current/oozie-client/conf', 'examples-dir', '/usr/hdp/current/hadoop-client/conf', 'c6402.ambari.apache.org:8050', 'hdfs://c6401.ambari.apache.org:8020', 'default'), tries = 3, try_sleep = 5, logoutput = True) http://git-wip-us.apache.org/repos/asf/ambari/blob/755c5eab/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py index dab3230..c96faff 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_service_check.py @@ -78,7 +78,7 @@ class TestServiceCheck(RMFTestCase): content = StaticFile('prepareOozieHdfsDirectories.sh'), mode = 0755, ) - self.assertResourceCalled('Execute', '/tmp/prepareOozieHdfsDirectories.sh /etc/oozie/conf / /etc/hadoop/conf c6402.ambari.apache.org:8050 hdfs://c6401.ambari.apache.org:8020 default', + self.assertResourceCalled('Execute', ('/tmp/prepareOozieHdfsDirectories.sh', '/etc/oozie/conf', '/', '/etc/hadoop/conf', 'c6402.ambari.apache.org:8050', 'hdfs://c6401.ambari.apache.org:8020', 'default'), logoutput = True, tries = 3, try_sleep = 5,
