Repository: ambari Updated Branches: refs/heads/branch-2.4 a4b22856b -> f77b41582 refs/heads/trunk 0926cdc6d -> a79c98d48
AMBARI-16955. Allow setting log level, and java opts for hive interactive/llap (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a79c98d4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a79c98d4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a79c98d4 Branch: refs/heads/trunk Commit: a79c98d485bfa08141c6c4457064c70d16f9c9e6 Parents: 0926cdc Author: Lisnichenko Dmitro <[email protected]> Authored: Mon May 30 16:50:19 2016 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Mon May 30 16:50:19 2016 +0300 ---------------------------------------------------------------------- .../0.12.0.2.0/package/scripts/hive_server_interactive.py | 3 +-- .../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 1 + .../services/HIVE/configuration/hive-interactive-env.xml | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a79c98d4/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py index 2fb8f0b..77e1cd4 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py @@ -218,8 +218,7 @@ class HiveServerInteractiveDefault(HiveServerInteractive): "{llap_keytab_splits[4]} --slider-principal {hive_headless_keytab}") # Append args. - cmd+= " --args \" -XX:+UseG1GC -XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts" \ - " -XX:+AlwaysPreTouch -XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=80 -XX:MaxGCPauseMillis=200\"" + cmd+= format(" --args \" {llap_app_java_opts}\"") # TODO: Remove adding "-XX:MaxDirectMemorySize" when Driver starts appending itself. if params.hive_llap_io_mem_size > params.llap_heap_size: max_dir_mem_size = long(params.hive_llap_io_mem_size) + 256 http://git-wip-us.apache.org/repos/asf/ambari/blob/a79c98d4/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 4d85d4b..7657dbc 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 @@ -589,6 +589,7 @@ if has_hive_interactive: start_hiveserver2_interactive_path = format("{tmp_dir}/start_hiveserver2_interactive_script") hive_interactive_env_sh_template = config['configurations']['hive-interactive-env']['content'] hive_interactive_enabled = default('/configurations/hive-interactive-env/enable_hive_interactive', False) + llap_app_java_opts = default('/configurations/hive-interactive-env/llap_java_opts', '-XX:+UseG1GC -XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts -XX:+AlwaysPreTouch -XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=80 -XX:MaxGCPauseMillis=200') # Service check related if hive_transport_mode.lower() == "http": http://git-wip-us.apache.org/repos/asf/ambari/blob/a79c98d4/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml index e5b532c..a6fffc0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/configuration/hive-interactive-env.xml @@ -186,8 +186,8 @@ <property> <name>llap_log_level</name> <value>INFO</value> - <description>LLAP app logging level</description> - <display-name>LLAP app logging level</display-name> + <description>LLAP app logging level (WARN/INFO/DEBUG/TRACE)</description> + <display-name>LLAP app logging level (WARN/INFO/DEBUG/TRACE)</display-name> </property> <property> <name>llap_app_name</name> @@ -195,6 +195,12 @@ <description>LLAP app name</description> <display-name>LLAP app name</display-name> </property> + <property> + <name>llap_java_opts</name> + <value>-XX:+UseG1GC -XX:TLABSize=8m -XX:+ResizeTLAB -XX:+UseNUMA -XX:+AggressiveOpts -XX:+AlwaysPreTouch -XX:MetaspaceSize=1024m -XX:InitiatingHeapOccupancyPercent=80 -XX:MaxGCPauseMillis=200</value> + <description>Java opts for llap application</description> + <display-name>LLAP app java opts</display-name> + </property> <!-- hive-env.sh --> <property>
