Repository: ambari Updated Branches: refs/heads/trunk 79588cedb -> f4f685239
AMBARI-18234. Fix for : (1). Hive service check for HSI and (2). HSI alert on wire encrypted cluster. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f4f68523 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4f68523 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4f68523 Branch: refs/heads/trunk Commit: f4f685239b9eb1310bd272e841b4c238c7324b6f Parents: 79588ce Author: Swapan Shridhar <[email protected]> Authored: Mon Aug 22 14:51:37 2016 -0700 Committer: Swapan Shridhar <[email protected]> Committed: Mon Aug 22 16:15:00 2016 -0700 ---------------------------------------------------------------------- .../alerts/alert_hive_interactive_thrift_port.py | 4 ++-- .../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 2 ++ .../HIVE/0.12.0.2.0/package/scripts/service_check.py | 13 +++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f4f68523/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py index 6917160..1386c36 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py @@ -43,8 +43,8 @@ SMOKEUSER_KEYTAB_KEY = '{{cluster-env/smokeuser_keytab}}' SMOKEUSER_PRINCIPAL_KEY = '{{cluster-env/smokeuser_principal_name}}' SMOKEUSER_KEY = '{{cluster-env/smokeuser}}' HIVE_SSL = '{{hive-site/hive.server2.use.SSL}}' -HIVE_SSL_KEYSTORE_PATH = '{{hive-site/hive.server2.keystore.path}}' -HIVE_SSL_KEYSTORE_PASSWORD = '{{hive-site/hive.server2.keystore.password}}' +HIVE_SSL_KEYSTORE_PATH = '{{hive-interactive-site/hive.server2.keystore.path}}' +HIVE_SSL_KEYSTORE_PASSWORD = '{{hive-interactive-site/hive.server2.keystore.password}}' # The configured Kerberos executable search paths, if any KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY = '{{kerberos-env/executable_search_paths}}' http://git-wip-us.apache.org/repos/asf/ambari/blob/f4f68523/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 1cd58c3..5e3e233 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 @@ -329,7 +329,9 @@ hive_server2_authentication = config['configurations']['hive-site']['hive.server # ssl options 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_interactive_ssl_keystore_path = default('/configurations/hive-interactive-site/hive.server2.keystore.path', None) hive_ssl_keystore_password = default('/configurations/hive-site/hive.server2.keystore.password', None) +hive_interactive_ssl_keystore_password = default('/configurations/hive-interactive-site/hive.server2.keystore.password', None) smokeuser = config['configurations']['cluster-env']['smokeuser'] smoke_test_sql = format("{tmp_dir}/hiveserver2.sql") http://git-wip-us.apache.org/repos/asf/ambari/blob/f4f68523/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/service_check.py index 303bdda..90a97fe 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/service_check.py @@ -75,7 +75,7 @@ class HiveServiceCheckDefault(HiveServiceCheck): Logger.info("Running Hive Server checks") Logger.info("--------------------------\n") self.check_hive_server(env, 'Hive Server', kinit_cmd, params.hive_server_hosts, - int(format("{hive_server_port}"))) + int(format("{hive_server_port}")), params.hive_ssl_keystore_path, params.hive_ssl_keystore_password) if params.has_hive_interactive and params.hive_interactive_enabled: @@ -83,7 +83,8 @@ class HiveServiceCheckDefault(HiveServiceCheck): Logger.info("--------------------------\n") self.check_hive_server(env, 'Hive Server2', kinit_cmd, params.hive_interactive_hosts, - int(format("{hive_server_interactive_port}"))) + int(format("{hive_server_interactive_port}")), params.hive_interactive_ssl_keystore_path, + params.hive_interactive_ssl_keystore_password) Logger.info("Running LLAP checks") Logger.info("-------------------\n") @@ -100,10 +101,10 @@ class HiveServiceCheckDefault(HiveServiceCheck): Logger.info("---------------------\n") webhcat_service_check() - def check_hive_server(self, env, server_component_name, kinit_cmd, address_list, server_port): + def check_hive_server(self, env, server_component_name, kinit_cmd, address_list, server_port, ssl_keystore, ssl_password): import params env.set_params(params) - Logger.info("Server Address List : {0}, Port : {1}".format(address_list, server_port)) + Logger.info("Server Address List : {0}, Port : {1}, SSL KeyStore : {2}".format(address_list, server_port, ssl_keystore)) if not address_list: raise Fail("Can not find any "+server_component_name+" ,host. Please check configuration.") @@ -123,8 +124,8 @@ class HiveServiceCheckDefault(HiveServiceCheck): check_thrift_port_sasl(address, server_port, params.hive_server2_authentication, params.hive_server_principal, kinit_cmd, params.smokeuser, transport_mode=params.hive_transport_mode, http_endpoint=params.hive_http_endpoint, - ssl=params.hive_ssl, ssl_keystore=params.hive_ssl_keystore_path, - ssl_password=params.hive_ssl_keystore_password) + ssl=params.hive_ssl, ssl_keystore=ssl_keystore, + ssl_password=ssl_password) Logger.info("Successfully connected to {0} on port {1}".format(address, server_port)) workable_server_available = True except:
