Repository: ambari Updated Branches: refs/heads/trunk b96edcf90 -> ad3323ef6
AMBARI-5572 Hive Metastore start command fails if hive client is not co-hosted with hive metastore (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ad3323ef Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ad3323ef Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ad3323ef Branch: refs/heads/trunk Commit: ad3323ef638e289a7ad6a09f594ee9637f3b117a Parents: b96edcf Author: Dmitry Sen <[email protected]> Authored: Fri Apr 25 20:03:51 2014 +0300 Committer: Dmitry Sen <[email protected]> Committed: Fri Apr 25 20:03:51 2014 +0300 ---------------------------------------------------------------------- .../2.0.6/services/HIVE/package/scripts/hive.py | 18 +++++++------ .../stacks/2.0.6/HIVE/test_hive_metastore.py | 20 +++++++------- .../stacks/2.0.6/HIVE/test_hive_server.py | 20 +++++++------- .../stacks/2.1/HIVE/test_hive_metastore.py | 28 ++++++++++---------- 4 files changed, 44 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ad3323ef/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py index e472947..42a8610 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/hive.py @@ -73,18 +73,26 @@ def hive(name=None): Execute(cmd, not_if=format("[ -f {check_db_connection_jar_name}]")) + File(format("{hive_config_dir}/hive-env.sh"), + owner=params.hive_user, + group=params.user_group, + content=Template('hive-env.sh.j2', conf_dir=hive_config_dir) + ) + if name == 'metastore': File(params.start_metastore_path, mode=0755, content=StaticFile('startMetastore.sh') ) if params.init_metastore_schema: - create_schema_cmd = format("{hive_bin}/schematool -initSchema " + create_schema_cmd = format("export HIVE_CONF_DIR={hive_config_dir} ; " + "{hive_bin}/schematool -initSchema " "-dbType {hive_metastore_db_type} " "-userName {hive_metastore_user_name} " "-passWord {hive_metastore_user_passwd}") - check_schema_created_cmd = format("{hive_bin}/schematool -info " + check_schema_created_cmd = format("export HIVE_CONF_DIR={hive_config_dir} ; " + "{hive_bin}/schematool -info " "-dbType {hive_metastore_db_type} " "-userName {hive_metastore_user_name} " "-passWord {hive_metastore_user_passwd}") @@ -103,12 +111,6 @@ def hive(name=None): crt_directory(params.hive_log_dir) crt_directory(params.hive_var_lib) - File(format("{hive_config_dir}/hive-env.sh"), - owner=params.hive_user, - group=params.user_group, - content=Template('hive-env.sh.j2', conf_dir=hive_config_dir) - ) - crt_file(format("{hive_conf_dir}/hive-default.xml.template")) crt_file(format("{hive_conf_dir}/hive-env.sh.template")) http://git-wip-us.apache.org/repos/asf/ambari/blob/ad3323ef/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py index fd0ed05..f5148ff 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py @@ -167,6 +167,11 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'", not_if = '[ -f DBConnectionVerification.jar]', ) + self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh', + content = Template('hive-env.sh.j2', conf_dir="/etc/hive/conf.server"), + owner = 'hive', + group = 'hadoop', + ) self.assertResourceCalled('File', '/tmp/start_metastore_script', content = StaticFile('startMetastore.sh'), mode = 0755, @@ -189,11 +194,6 @@ class TestHiveMetastore(RMFTestCase): mode = 0755, recursive = True, ) - self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh', - content = Template('hive-env.sh.j2', conf_dir="/etc/hive/conf.server"), - owner = 'hive', - group = 'hadoop', - ) self.assertResourceCalled('File', '/etc/hive/conf/hive-default.xml.template', owner = 'hive', group = 'hadoop', @@ -231,6 +231,11 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'", not_if = '[ -f DBConnectionVerification.jar]', ) + self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh', + content = Template('hive-env.sh.j2', conf_dir="/etc/hive/conf.server"), + owner = 'hive', + group = 'hadoop', + ) self.assertResourceCalled('File', '/tmp/start_metastore_script', content = StaticFile('startMetastore.sh'), mode = 0755, @@ -253,11 +258,6 @@ class TestHiveMetastore(RMFTestCase): mode = 0755, recursive = True, ) - self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh', - content = Template('hive-env.sh.j2', conf_dir="/etc/hive/conf.server"), - owner = 'hive', - group = 'hadoop', - ) self.assertResourceCalled('File', '/etc/hive/conf/hive-default.xml.template', owner = 'hive', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/ad3323ef/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py index 1c31e29..d2a0390 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py @@ -258,6 +258,11 @@ class TestHiveServer(RMFTestCase): self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'", not_if = '[ -f DBConnectionVerification.jar]', ) + self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh', + content = Template('hive-env.sh.j2', conf_dir="/etc/hive/conf.server"), + owner = 'hive', + group = 'hadoop', + ) self.assertResourceCalled('File', '/tmp/start_hiveserver2_script', content = Template('startHiveserver2.sh.j2'), mode = 0755, @@ -280,11 +285,6 @@ class TestHiveServer(RMFTestCase): mode = 0755, recursive = True, ) - self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh', - content = Template('hive-env.sh.j2', conf_dir="/etc/hive/conf.server"), - owner = 'hive', - group = 'hadoop', - ) self.assertResourceCalled('File', '/etc/hive/conf/hive-default.xml.template', owner = 'hive', group = 'hadoop', @@ -351,6 +351,11 @@ class TestHiveServer(RMFTestCase): self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'", not_if = '[ -f DBConnectionVerification.jar]', ) + self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh', + content = Template('hive-env.sh.j2', conf_dir="/etc/hive/conf.server"), + owner = 'hive', + group = 'hadoop', + ) self.assertResourceCalled('File', '/tmp/start_hiveserver2_script', content = Template('startHiveserver2.sh.j2'), mode = 0755, @@ -373,11 +378,6 @@ class TestHiveServer(RMFTestCase): mode = 0755, recursive = True, ) - self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh', - content = Template('hive-env.sh.j2', conf_dir="/etc/hive/conf.server"), - owner = 'hive', - group = 'hadoop', - ) self.assertResourceCalled('File', '/etc/hive/conf/hive-default.xml.template', owner = 'hive', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/ad3323ef/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py index 351571e..111d8b3 100644 --- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py +++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py @@ -125,12 +125,17 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'", not_if = '[ -f DBConnectionVerification.jar]', ) + self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh', + content = Template('hive-env.sh.j2', conf_dir="/etc/hive/conf.server"), + owner = 'hive', + group = 'hadoop', + ) self.assertResourceCalled('File', '/tmp/start_metastore_script', content = StaticFile('startMetastore.sh'), mode = 0755, ) - self.assertResourceCalled('Execute', "/usr/lib/hive/bin/schematool -initSchema -dbType mysql -userName hive -passWord asd", - not_if = '/usr/lib/hive/bin/schematool -info -dbType mysql -userName hive -passWord asd', + self.assertResourceCalled('Execute', "export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/lib/hive/bin/schematool -initSchema -dbType mysql -userName hive -passWord asd", + not_if = 'export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/lib/hive/bin/schematool -info -dbType mysql -userName hive -passWord asd', ) self.assertResourceCalled('Directory', '/var/run/hive', owner = 'hive', @@ -150,11 +155,6 @@ class TestHiveMetastore(RMFTestCase): mode = 0755, recursive = True, ) - self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh', - content = Template('hive-env.sh.j2', conf_dir="/etc/hive/conf.server"), - owner = 'hive', - group = 'hadoop', - ) self.assertResourceCalled('File', '/etc/hive/conf/hive-default.xml.template', owner = 'hive', group = 'hadoop', @@ -192,12 +192,17 @@ class TestHiveMetastore(RMFTestCase): self.assertResourceCalled('Execute', "/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 http://c6401.ambari.apache.org:8080/resources/DBConnectionVerification.jar -o DBConnectionVerification.jar'", not_if = '[ -f DBConnectionVerification.jar]', ) + self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh', + content = Template('hive-env.sh.j2', conf_dir="/etc/hive/conf.server"), + owner = 'hive', + group = 'hadoop', + ) self.assertResourceCalled('File', '/tmp/start_metastore_script', content = StaticFile('startMetastore.sh'), mode = 0755, ) - self.assertResourceCalled('Execute', "/usr/lib/hive/bin/schematool -initSchema -dbType mysql -userName hive -passWord asd", - not_if = '/usr/lib/hive/bin/schematool -info -dbType mysql -userName hive -passWord asd', + self.assertResourceCalled('Execute', "export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/lib/hive/bin/schematool -initSchema -dbType mysql -userName hive -passWord asd", + not_if = 'export HIVE_CONF_DIR=/etc/hive/conf.server ; /usr/lib/hive/bin/schematool -info -dbType mysql -userName hive -passWord asd', ) self.assertResourceCalled('Directory', '/var/run/hive', owner = 'hive', @@ -217,11 +222,6 @@ class TestHiveMetastore(RMFTestCase): mode = 0755, recursive = True, ) - self.assertResourceCalled('File', '/etc/hive/conf.server/hive-env.sh', - content = Template('hive-env.sh.j2', conf_dir="/etc/hive/conf.server"), - owner = 'hive', - group = 'hadoop', - ) self.assertResourceCalled('File', '/etc/hive/conf/hive-default.xml.template', owner = 'hive', group = 'hadoop',
