Repository: ambari Updated Branches: refs/heads/trunk e71f3a97a -> 95693516c
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/95693516 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/95693516 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/95693516 Branch: refs/heads/trunk Commit: 95693516ca5ea9f44b6c04e38b3024fce06050a8 Parents: e71f3a97 Author: Vishal Suvagia <[email protected]> Authored: Mon Feb 6 11:49:38 2017 +0530 Committer: Mugdha Varadkar <[email protected]> Committed: Mon Feb 6 17:14:05 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/95693516/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 211fe0a..9191c12 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 @@ -705,7 +705,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:
