You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/02/13 21:04:17 UTC

[43/50] [abbrv] ambari git commit: 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)

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/4061cbab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4061cbab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4061cbab

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 4061cbab874fb05eab46f0e85d3ba243bb1bf3ee
Parents: 9670245
Author: Vishal Suvagia <vi...@yahoo.com>
Authored: Mon Feb 6 11:49:38 2017 +0530
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Feb 13 15:45:36 2017 -0500

----------------------------------------------------------------------
 .../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/4061cbab/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: