AMBARI-18969. Add support to provide additional slider specific parameters to llap (smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/99cb9029 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/99cb9029 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/99cb9029 Branch: refs/heads/branch-feature-AMBARI-18634 Commit: 99cb9029a2845909e3351f5e6665a457d2c19e93 Parents: b59dc1d Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Wed Nov 23 11:42:05 2016 -0800 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Wed Nov 23 11:42:14 2016 -0800 ---------------------------------------------------------------------- .../0.12.0.2.0/package/scripts/hive_server_interactive.py | 4 ++-- .../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 1 + .../services/HIVE/configuration/hive-interactive-env.xml | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/99cb9029/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 d3773a7..b5edac8 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 @@ -274,9 +274,9 @@ class HiveServerInteractiveDefault(HiveServerInteractive): unique_name = "llap-slider%s" % datetime.utcnow().strftime('%Y-%m-%d_%H-%M-%S') cmd = format("{stack_root}/current/hive-server2-hive2/bin/hive --service llap --instances {params.num_llap_nodes}" - " --slider-am-container-mb {params.slider_am_container_mb} --size {params.llap_daemon_container_size}m " + " --slider-am-container-mb {params.slider_am_container_mb} --size {params.llap_daemon_container_size}m" " --cache {params.hive_llap_io_mem_size}m --xmx {params.llap_heap_size}m --loglevel {params.llap_log_level}" - " --output {LLAP_PACKAGE_CREATION_PATH}/{unique_name}") + " {params.llap_extra_slider_opts} --output {LLAP_PACKAGE_CREATION_PATH}/{unique_name}") if params.security_enabled: llap_keytab_splits = params.hive_llap_keytab_file.split("/") Logger.debug("llap_keytab_splits : {0}".format(llap_keytab_splits)) http://git-wip-us.apache.org/repos/asf/ambari/blob/99cb9029/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 30fc82a..a461bfe 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 @@ -607,6 +607,7 @@ if has_hive_interactive: hive_llap_io_mem_size = config['configurations']['hive-interactive-site']['hive.llap.io.memory.size'] llap_heap_size = config['configurations']['hive-interactive-env']['llap_heap_size'] llap_app_name = config['configurations']['hive-interactive-env']['llap_app_name'] + llap_extra_slider_opts = default('/configurations/hive-interactive-env/llap_extra_slider_opts', "") hive_llap_principal = None if security_enabled: hive_llap_keytab_file = config['configurations']['hive-interactive-site']['hive.llap.zk.sm.keytab.file'] http://git-wip-us.apache.org/repos/asf/ambari/blob/99cb9029/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 1fd72eb..279c7c4 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 @@ -113,6 +113,16 @@ <on-ambari-upgrade add="true"/> </property> <property> + <name>llap_extra_slider_opts</name> + <value></value> + <description>Additional slider specific opts for llap such as port range</description> + <display-name>Additional slider specific opts for llap</display-name> + <value-attributes> + <empty-value-valid>true</empty-value-valid> + </value-attributes> + <on-ambari-upgrade add="false"/> + </property> + <property> <name>num_retries_for_checking_llap_status</name> <value>10</value> <description>After starting LLAP app, retry count to check LLAP status before starting HiveServer2.</description>
