Repository: ambari Updated Branches: refs/heads/branch-2.5 f7bb18db4 -> c7d6f27fd
AMBARI-19864 : Zookeeper namespace for Hive service should be taken from hive-interactive-site, when only Hive-server Interactive is installed (Vishal Suvagia via mugdha) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c7d6f27f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c7d6f27f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c7d6f27f Branch: refs/heads/branch-2.5 Commit: c7d6f27fd4b17258de181ad6c9bec726f3030a18 Parents: f7bb18d Author: Vishal Suvagia <[email protected]> Authored: Mon Feb 6 11:49:38 2017 +0530 Committer: Mugdha Varadkar <[email protected]> Committed: Mon Feb 6 17:12:50 2017 +0530 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c7d6f27f/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 bee263a..e28cff8 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 @@ -704,7 +704,10 @@ if has_hive_interactive: hive_llap_principal = (config['configurations']['hive-interactive-site']['hive.llap.zk.sm.principal']).replace('_HOST',hostname.lower()) pass -hive_server2_zookeeper_namespace = config['configurations']['hive-site']['hive.server2.zookeeper.namespace'] +if len(hive_server_hosts) == 0 and len(hive_server_interactive_hosts) > 0: + hive_server2_zookeeper_namespace = config['configurations']['hive-interactive-site']['hive.server2.zookeeper.namespace'] +else: + hive_server2_zookeeper_namespace = config['configurations']['hive-site']['hive.server2.zookeeper.namespace'] hive_zookeeper_quorum = config['configurations']['hive-site']['hive.zookeeper.quorum'] if security_enabled:
