Repository: ambari Updated Branches: refs/heads/trunk a04bd5fb2 -> 9b5705a4e
AMBARI-5028. Hive Service Check Failed during Install Wizard. (mahadev) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9b5705a4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9b5705a4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9b5705a4 Branch: refs/heads/trunk Commit: 9b5705a4e9cca318624aad09c6f4e6e10c4afc81 Parents: a04bd5f Author: Mahadev Konar <maha...@apache.org> Authored: Tue Mar 11 10:02:25 2014 -0700 Committer: Mahadev Konar <maha...@apache.org> Committed: Tue Mar 11 10:02:30 2014 -0700 ---------------------------------------------------------------------- .../stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py | 2 +- .../stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py | 2 +- .../src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py | 4 ++-- .../src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9b5705a4/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py index 6380a39..968ade0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/package/scripts/params.py @@ -46,7 +46,7 @@ check_db_connection_jar = format("/usr/lib/ambari-agent/{check_db_connection_jar #common hive_metastore_port = config['configurations']['global']['hive_metastore_port'] hive_var_lib = '/var/lib/hive' -hive_server_host = config['clusterHostInfo']['hive_server_host'] +hive_server_host = config['clusterHostInfo']['hive_server_host'][0] hive_url = format("jdbc:hive2://{hive_server_host}:10000") smokeuser = config['configurations']['global']['smokeuser'] http://git-wip-us.apache.org/repos/asf/ambari/blob/9b5705a4/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py index a71e444..2b4a0d9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py @@ -46,7 +46,7 @@ check_db_connection_jar = format("/usr/lib/ambari-agent/{check_db_connection_jar #common hive_metastore_port = config['configurations']['global']['hive_metastore_port'] hive_var_lib = '/var/lib/hive' -hive_server_host = config['clusterHostInfo']['hive_server_host'] +hive_server_host = config['clusterHostInfo']['hive_server_host'][0] hive_url = format("jdbc:hive2://{hive_server_host}:10000") smokeuser = config['configurations']['global']['smokeuser'] http://git-wip-us.apache.org/repos/asf/ambari/blob/9b5705a4/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py index e8bedab..f1deec7 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py +++ b/ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py @@ -38,7 +38,7 @@ class TestServiceCheck(RMFTestCase): self.assertResourceCalled('File', '/tmp/hiveserver2.sql', content = StaticFile('hiveserver2.sql'), ) - self.assertResourceCalled('Execute', "env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/hiveserver2Smoke.sh jdbc:hive2://[u'c6402.ambari.apache.org']:10000 /tmp/hiveserver2.sql", + self.assertResourceCalled('Execute', "env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/hiveserver2Smoke.sh jdbc:hive2://c6402.ambari.apache.org:10000 /tmp/hiveserver2.sql", logoutput = True, path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries = 3, @@ -87,7 +87,7 @@ class TestServiceCheck(RMFTestCase): self.assertResourceCalled('File', '/tmp/hiveserver2.sql', content = StaticFile('hiveserver2.sql'), ) - self.assertResourceCalled('Execute', "/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/hiveserver2Smoke.sh jdbc:hive2://[u'c6402.ambari.apache.org']:10000/\\;principal=/etc/security/keytabs/hive.service.keytab /tmp/hiveserver2.sql", + self.assertResourceCalled('Execute', "/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/hiveserver2Smoke.sh jdbc:hive2://c6402.ambari.apache.org:10000/\\;principal=/etc/security/keytabs/hive.service.keytab /tmp/hiveserver2.sql", logoutput = True, path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries = 3, http://git-wip-us.apache.org/repos/asf/ambari/blob/9b5705a4/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py index cdfecc7..6390a70 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py +++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py @@ -38,7 +38,7 @@ class TestServiceCheck(RMFTestCase): self.assertResourceCalled('File', '/tmp/hiveserver2.sql', content = StaticFile('hiveserver2.sql'), ) - self.assertResourceCalled('Execute', "env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/hiveserver2Smoke.sh jdbc:hive2://[u'c6402.ambari.apache.org']:10000 /tmp/hiveserver2.sql", + self.assertResourceCalled('Execute', "env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/hiveserver2Smoke.sh jdbc:hive2://c6402.ambari.apache.org:10000 /tmp/hiveserver2.sql", logoutput = True, path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries = 3, @@ -87,7 +87,7 @@ class TestServiceCheck(RMFTestCase): self.assertResourceCalled('File', '/tmp/hiveserver2.sql', content = StaticFile('hiveserver2.sql'), ) - self.assertResourceCalled('Execute', "/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/hiveserver2Smoke.sh jdbc:hive2://[u'c6402.ambari.apache.org']:10000/\\;principal=/etc/security/keytabs/hive.service.keytab /tmp/hiveserver2.sql", + self.assertResourceCalled('Execute', "/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; env JAVA_HOME=/usr/jdk64/jdk1.7.0_45 /tmp/hiveserver2Smoke.sh jdbc:hive2://c6402.ambari.apache.org:10000/\\;principal=/etc/security/keytabs/hive.service.keytab /tmp/hiveserver2.sql", logoutput = True, path = ['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'], tries = 3,
