Repository: ambari Updated Branches: refs/heads/trunk 50d36f9a5 -> b591250fb
AMBARI-13535. Hive service check failed with ssl enabled. (Chen Xin Yu via yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b591250f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b591250f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b591250f Branch: refs/heads/trunk Commit: b591250fba9c95fdf6423232337441308681a36b Parents: 50d36f9 Author: Yusaku Sako <[email protected]> Authored: Thu Oct 29 01:06:49 2015 -0700 Committer: Yusaku Sako <[email protected]> Committed: Thu Oct 29 01:07:22 2015 -0700 ---------------------------------------------------------------------- .../resource_management/libraries/functions/hive_check.py | 2 +- .../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b591250f/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py index 55fd6bd..554b1dc 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py @@ -61,7 +61,7 @@ def check_thrift_port_sasl(address, port, hive_auth="NOSASL", key=None, kinitcmd beeline_url.append('principal={key}') Execute(kinitcmd, user=smokeuser) - cmd = "! beeline -u '%s' -e '' 2>&1| awk '{print}'|grep -i -e 'Connection refused' -e 'Invalid URL'" % \ + cmd = "! beeline -u '%s' -e '' 2>&1| awk '{print}'|grep -i -e 'Connection refused' -e 'Invalid URL' -e 'Error'" % \ format(";".join(beeline_url)) Execute(cmd, user=smokeuser, http://git-wip-us.apache.org/repos/asf/ambari/blob/b591250f/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py index aadb17f..f2ddc80 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py @@ -224,14 +224,14 @@ else: hive_server_port = default('/configurations/hive-site/hive.server2.thrift.port',"10000") hive_url = format("jdbc:hive2://{hive_server_host}:{hive_server_port}") -hive_http_endpoint = default('/confiurations/hive-site/hive.server2.thrift.http.path', "cliservice") +hive_http_endpoint = default('/configurations/hive-site/hive.server2.thrift.http.path', "cliservice") hive_server_principal = config['configurations']['hive-site']['hive.server2.authentication.kerberos.principal'] hive_server2_authentication = config['configurations']['hive-site']['hive.server2.authentication'] # ssl options -hive_ssl = default('/confiurations/hive-site/hive.server2.use.SSL', False) -hive_ssl_keystore_path = default('/confiurations/hive-site/hive.server2.keystore.path', None) -hive_ssl_keystore_password = default('/confiurations/hive-site/hive.server2.keystore.password', None) +hive_ssl = default('/configurations/hive-site/hive.server2.use.SSL', False) +hive_ssl_keystore_path = default('/configurations/hive-site/hive.server2.keystore.path', None) +hive_ssl_keystore_password = default('/configurations/hive-site/hive.server2.keystore.password', None) smokeuser = config['configurations']['cluster-env']['smokeuser'] smoke_test_sql = format("{tmp_dir}/hiveserver2.sql")
