Repository: ambari Updated Branches: refs/heads/trunk 178a350f6 -> 177d7a3ba
AMBARI-16303. HiveServer interactive fails to start. (Daniel Gergely via stoader) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/177d7a3b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/177d7a3b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/177d7a3b Branch: refs/heads/trunk Commit: 177d7a3babf0c23b419b72b40e251adf788d82b1 Parents: 178a350 Author: Daniel Gergely <dgerg...@hortonworks.com> Authored: Mon May 9 17:12:00 2016 +0200 Committer: Toader, Sebastian <stoa...@hortonworks.com> Committed: Mon May 9 17:12:00 2016 +0200 ---------------------------------------------------------------------- .../internal/BlueprintConfigurationProcessor.java | 5 +++++ .../resources/stacks/HDP/2.5/services/stack_advisor.py | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/177d7a3b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java index 29f937a..ec02f00 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java @@ -2234,6 +2234,7 @@ public class BlueprintConfigurationProcessor { Map<String, PropertyUpdater> hadoopEnvMap = new HashMap<String, PropertyUpdater>(); Map<String, PropertyUpdater> hbaseEnvMap = new HashMap<String, PropertyUpdater>(); Map<String, PropertyUpdater> hiveEnvMap = new HashMap<String, PropertyUpdater>(); + Map<String, PropertyUpdater> hiveInteractiveEnvMap = new HashMap<String, PropertyUpdater>(); Map<String, PropertyUpdater> oozieEnvMap = new HashMap<String, PropertyUpdater>(); Map<String, PropertyUpdater> oozieEnvHeapSizeMap = new HashMap<String, PropertyUpdater>(); Map<String, PropertyUpdater> oozieEnvOriginalValueMap = new HashMap<String, PropertyUpdater>(); @@ -2271,6 +2272,7 @@ public class BlueprintConfigurationProcessor { singleHostTopologyUpdaters.put("hbase-site", hbaseSiteMap); singleHostTopologyUpdaters.put("yarn-site", yarnSiteMap); singleHostTopologyUpdaters.put("hive-site", hiveSiteMap); + singleHostTopologyUpdaters.put("hive-interactive-env", hiveInteractiveEnvMap); singleHostTopologyUpdaters.put("oozie-site", oozieSiteMap); singleHostTopologyUpdaters.put("storm-site", stormSiteMap); singleHostTopologyUpdaters.put("accumulo-site", accumuloSiteMap); @@ -2382,6 +2384,9 @@ public class BlueprintConfigurationProcessor { multiHiveSiteMap.put("hive.zookeeper.quorum", new MultipleHostTopologyUpdater("ZOOKEEPER_SERVER")); multiHiveSiteMap.put("hive.cluster.delegation.token.store.zookeeper.connectString", new MultipleHostTopologyUpdater("ZOOKEEPER_SERVER")); + // HIVE Interactive Server + hiveInteractiveEnvMap.put("hive_server_interactive_host", new SingleHostTopologyUpdater("HIVE_SERVER_INTERACTIVE")); + // HIVE Atlas integration hiveSiteNonTopologyMap.put("hive.exec.post.hooks", new NonTopologyUpdater() { @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/177d7a3b/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 37e6ef6..b8c44d3 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 @@ -329,8 +329,8 @@ class HDP25StackAdvisor(HDP24StackAdvisor): putHiveInteractiveEnvPropertyAttribute('num_llap_nodes', "minimum", 1) putHiveInteractiveEnvPropertyAttribute('num_llap_nodes', "maximum", int(num_llap_nodes_max_limit)) - llap_container_size = long(llap_container_size) - llap_container_size_min_limit = long(llap_container_size_min_limit) + llap_container_size = max(long(yarn_min_container_size), long(llap_container_size)) + llap_container_size_min_limit = max(long(yarn_min_container_size), long(llap_container_size_min_limit)) putHiveInteractiveSiteProperty('hive.llap.daemon.yarn.container.mb', llap_container_size) putHiveInteractiveSitePropertyAttribute('hive.llap.daemon.yarn.container.mb', "minimum", llap_container_size_min_limit) @@ -686,7 +686,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor): else: raise Fail("Couldn't retrieve YARN's 'yarn.nodemanager.resource.cpu-vcores' config.") - mem_per_executor = hive_container_size * exec_to_cache_ratio; + mem_per_executor = hive_container_size * exec_to_cache_ratio if mem_per_executor > llap_container_size: mem_per_executor = llap_container_size @@ -758,10 +758,10 @@ class HDP25StackAdvisor(HDP24StackAdvisor): Normalize down 'val2' with respect to 'val1'. """ def _normalizeDown(self, val1, val2): - tmp = math.floor(val1 / val2); + tmp = math.floor(val1 / val2) if tmp < 1.00: return val1 - return tmp * val2; + return tmp * val2 """ Normalize up 'val2' with respect to 'val1'.
