ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stoa...@apache.org
Subject ambari git commit: AMBARI-16776. HiveServer interactive - incorrect default memory value. (Daniel Gergely via stoader)
Date Wed, 25 May 2016 06:53:28 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 71a0689e7 -> f19904109


AMBARI-16776. HiveServer interactive - incorrect default memory value. (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/f1990410
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f1990410
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f1990410

Branch: refs/heads/trunk
Commit: f199041091ef54b2d0deccd1a414b018a1420e1b
Parents: 71a0689
Author: Daniel Gergely <dgergely@hortonworks.com>
Authored: Wed May 25 08:51:03 2016 +0200
Committer: Toader, Sebastian <stoader@hortonworks.com>
Committed: Wed May 25 08:53:09 2016 +0200

----------------------------------------------------------------------
 .../HIVE/0.12.0.2.0/package/scripts/params_linux.py            | 2 ++
 .../2.5/services/HIVE/configuration/hive-interactive-site.xml  | 2 +-
 .../main/resources/stacks/HDP/2.5/services/stack_advisor.py    | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f1990410/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 f285853..76a417d 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
@@ -378,6 +378,8 @@ jars_in_hive_lib = format("{hive_lib}/*.jar")
 start_hiveserver2_path = format("{tmp_dir}/start_hiveserver2_script")
 start_metastore_path = format("{tmp_dir}/start_metastore_script")
 
+yarn_scheduler_allocation_minimum_mb = config['configurations']['yarn-site']['properties']['yarn.scheduler.minimum-allocation-mb']
+
 hadoop_heapsize = config['configurations']['hadoop-env']['hadoop_heapsize']
 
 if 'role' in config and config['role'] in ["HIVE_SERVER", "HIVE_METASTORE"]:

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1990410/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
index db5f616..1ff8413 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-site.xml
@@ -430,7 +430,7 @@ limitations under the License.
     <name>hive.llap.daemon.yarn.container.mb</name>
     <display-name>YARN Memory per Daemon</display-name>
     <description>The total YARN memory per node to be used by Hive LLAP daemons. This
includes memory for cache as well as for memory for query processing.</description>
-    <value>341</value>
+    <value>{{yarn_scheduler_allocation_minimum_mb}}</value>
     <value-attributes>
       <type>int</type>
       <unit>MB</unit>

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1990410/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 0512162..f07669b 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
@@ -227,6 +227,10 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
     llap_queue_selected_in_current_call = None
     LLAP_MAX_CONCURRENCY = 32 # Allow a max of 32 concurrency.
 
+    # initial memory setting to make sure hive.llap.daemon.yarn.container.mb >= yarn.scheduler.minimum-allocation-mb
+    Logger.debug("Setting hive.llap.daemon.yarn.container.mb to yarn min container size as
initial size (" + str(self.get_yarn_min_container_size(services)) + " MB).")
+    putHiveInteractiveSiteProperty('hive.llap.daemon.yarn.container.mb', long(self.get_yarn_min_container_size(services)))
+
     try:
       if self.HIVE_INTERACTIVE_SITE in services['configurations'] and \
           'hive.llap.daemon.queue.name' in services['configurations'][self.HIVE_INTERACTIVE_SITE]['properties']:
@@ -246,8 +250,6 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
             Logger.debug("Selected YARN queue is '{0}'. Setting LLAP queue capacity slider
visibility to True".format(llap_queue_name))
         else:
           putHiveInteractiveEnvPropertyAttribute("llap_queue_capacity", "visible", "false")
-          Logger.debug("Setting hive.llap.daemon.yarn.container.mb to yarn min container
size (" + str(self.get_yarn_min_container_size(services)) + " MB).")
-          putHiveInteractiveSiteProperty('hive.llap.daemon.yarn.container.mb', long(self.get_yarn_min_container_size(services)))
           Logger.debug("Queue selected for LLAP app is : '{0}'. Current YARN queues : {1}.
"
                     "Setting LLAP queue capacity slider visibility to False. "
                     "Skipping updating values for LLAP related configs".format(llap_daemon_selected_queue_name,
list(leafQueueNames)))


Mime
View raw message