Repository: ambari Updated Branches: refs/heads/trunk f1c7514d6 -> 2337a0bbd
AMBARI-16280. 'hive.llap.zk.sm.connectionString' config is not set to ZK quorum value on installation of the hive service. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2337a0bb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2337a0bb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2337a0bb Branch: refs/heads/trunk Commit: 2337a0bbd3138e55074118b64e898572277f7331 Parents: f1c7514 Author: Swapan Shridhar <[email protected]> Authored: Thu May 5 14:48:48 2016 -0700 Committer: Swapan Shridhar <[email protected]> Committed: Thu May 5 16:05:37 2016 -0700 ---------------------------------------------------------------------- .../stacks/HDP/2.5/services/stack_advisor.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2337a0bb/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py index 4a4c868..37e6ef6 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py @@ -140,6 +140,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor): def recommendHIVEConfigurations(self, configurations, clusterData, services, hosts): super(HDP25StackAdvisor, self).recommendHIVEConfigurations(configurations, clusterData, services, hosts) putHiveInteractiveEnvProperty = self.putProperty(configurations, "hive-interactive-env", services) + putHiveInteractiveSiteProperty = self.putProperty(configurations, self.HIVE_INTERACTIVE_SITE, services) # For 'Hive Server Interactive', if the component exists. hsi_hosts = self.__getHostsForComponent(services, "HIVE", "HIVE_SERVER_INTERACTIVE") @@ -148,13 +149,6 @@ class HDP25StackAdvisor(HDP24StackAdvisor): putHiveInteractiveEnvProperty('enable_hive_interactive', 'true') putHiveInteractiveEnvProperty('hive_server_interactive_host', hsi_host) - if 'hive.llap.zk.sm.connectionString' in services['configurations'][self.HIVE_INTERACTIVE_SITE]['properties']: - # Fill the property 'hive.llap.zk.sm.connectionString' required by Hive Server Interactive (HiveServer2) - zookeeper_host_port = self.getZKHostPortString(services) - if zookeeper_host_port: - putHiveInteractiveSiteProperty = self.putProperty(configurations, self.HIVE_INTERACTIVE_SITE, services) - putHiveInteractiveSiteProperty("hive.llap.zk.sm.connectionString", zookeeper_host_port) - # Update 'hive.llap.daemon.queue.name' if capacity scheduler is changed. if 'hive.llap.daemon.queue.name' in services['configurations'][self.HIVE_INTERACTIVE_SITE]['properties']: self.setLlapDaemonQueueName(services, configurations) @@ -174,6 +168,12 @@ class HDP25StackAdvisor(HDP24StackAdvisor): Logger.info("Updated 'Hive Server interactive' config 'hive.llap.io.enabled' to '{0}'.".format(llap_io_enabled)) else: putHiveInteractiveEnvProperty('enable_hive_interactive', 'false') + + if 'hive.llap.zk.sm.connectionString' in services['configurations'][self.HIVE_INTERACTIVE_SITE]['properties']: + # Fill the property 'hive.llap.zk.sm.connectionString' required by Hive Server Interactive (HiveServer2) + zookeeper_host_port = self.getZKHostPortString(services) + if zookeeper_host_port: + putHiveInteractiveSiteProperty("hive.llap.zk.sm.connectionString", zookeeper_host_port) pass
