Repository: ambari Updated Branches: refs/heads/branch-1.7.0 7466e14ac -> caf42aaa2
AMBARI-7720 Sqoop service check fails on HDP2.2 (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/caf42aaa Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/caf42aaa Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/caf42aaa Branch: refs/heads/branch-1.7.0 Commit: caf42aaa292414c3c2fb8ff1ad83ca5b709a49c1 Parents: 7466e14 Author: Dmytro Sen <[email protected]> Authored: Fri Oct 10 11:49:25 2014 +0300 Committer: Dmytro Sen <[email protected]> Committed: Fri Oct 10 16:09:42 2014 +0300 ---------------------------------------------------------------------- .../services/SQOOP/package/scripts/sqoop.py | 33 ++++++++------------ .../python/stacks/2.0.6/SQOOP/test_sqoop.py | 4 +++ 2 files changed, 17 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/caf42aaa/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/sqoop.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/sqoop.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/sqoop.py index c33e891..99ad575 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/sqoop.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/SQOOP/package/scripts/sqoop.py @@ -18,7 +18,7 @@ limitations under the License. """ from resource_management import * -import sys +import os def sqoop(type=None): import params @@ -30,29 +30,22 @@ def sqoop(type=None): group = params.user_group, recursive = True ) - File(format("{sqoop_conf_dir}/sqoop-env.sh"), owner=params.sqoop_user, + group = params.user_group, content=InlineTemplate(params.sqoop_env_sh_template) ) - - File (params.sqoop_conf_dir + "/sqoop-env-template.sh", - owner = params.sqoop_user, - group = params.user_group - ) - File (params.sqoop_conf_dir + "/sqoop-site-template.xml", - owner = params.sqoop_user, - group = params.user_group - ) - File (params.sqoop_conf_dir + "/sqoop-site.xml", - owner = params.sqoop_user, - group = params.user_group - ) + update_config_permissions(["sqoop-env-template.sh", + "sqoop-site-template.xml", + "sqoop-site.xml"]) pass -def sqoop_TemplateConfig(name, tag=None): +def update_config_permissions(names): import params - TemplateConfig( format("{sqoop_conf_dir}/{name}"), - owner = params.sqoop_user, - template_tag = tag - ) + for filename in names: + full_filename = os.path.join(params.sqoop_conf_dir, filename) + File(full_filename, + owner = params.sqoop_user, + group = params.user_group, + only_if = format("test -e {full_filename}") + ) http://git-wip-us.apache.org/repos/asf/ambari/blob/caf42aaa/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py index 09e2083..76948f7 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py +++ b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py @@ -36,15 +36,19 @@ class TestSqoop(RMFTestCase): group = 'hadoop',) self.assertResourceCalled('File', '/usr/lib/sqoop/conf/sqoop-env.sh', owner = 'sqoop', + group = 'hadoop', content = InlineTemplate(self.getConfig()['configurations']['sqoop-env']['content']) ) self.assertResourceCalled('File', '/usr/lib/sqoop/conf/sqoop-env-template.sh', + only_if = 'test -e /usr/lib/sqoop/conf/sqoop-env-template.sh', owner = 'sqoop', group = 'hadoop',) self.assertResourceCalled('File', '/usr/lib/sqoop/conf/sqoop-site-template.xml', + only_if = 'test -e /usr/lib/sqoop/conf/sqoop-site-template.xml', owner = 'sqoop', group = 'hadoop',) self.assertResourceCalled('File', '/usr/lib/sqoop/conf/sqoop-site.xml', + only_if = 'test -e /usr/lib/sqoop/conf/sqoop-site.xml', owner = 'sqoop', group = 'hadoop',) self.assertNoMoreResources()
