Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 181131d00 -> b90636121


AMBARI-18440. Add the option of providing 'aux jars' while creating LLAP 
package.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b9063612
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b9063612
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b9063612

Branch: refs/heads/branch-2.5
Commit: b90636121f8cd5c74e24ac6f0a07680ede6d6d77
Parents: 181131d
Author: Swapan Shridhar <sshrid...@hortonworks.com>
Authored: Wed Sep 21 16:38:46 2016 -0700
Committer: Swapan Shridhar <sshrid...@hortonworks.com>
Committed: Wed Sep 21 17:20:43 2016 -0700

----------------------------------------------------------------------
 .../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, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b9063612/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 673f559..1b3cf21 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
@@ -269,6 +269,10 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
         cmd += format(" --slider-keytab-dir 
.slider/keytabs/{params.hive_user}/ --slider-keytab "
                       "{llap_keytab_splits[4]} --slider-principal 
{params.hive_llap_principal}")
 
+      # Add the aux jars if they are specified. If empty, dont need to add 
this param.
+      if params.hive_aux_jars:
+        cmd+= format(" --auxjars {params.hive_aux_jars}")
+
       # Append args.
       llap_java_args = InlineTemplate(params.llap_app_java_opts).get_content()
       cmd += format(" --args \" {llap_java_args}\"")

http://git-wip-us.apache.org/repos/asf/ambari/blob/b9063612/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 cba6feb..580d541 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:
   num_llap_nodes = 
config['configurations']['hive-interactive-env']['num_llap_nodes']
   llap_daemon_container_size = 
config['configurations']['hive-interactive-site']['hive.llap.daemon.yarn.container.mb']
   llap_log_level = 
config['configurations']['hive-interactive-env']['llap_log_level']
+  hive_aux_jars = 
default('/configurations/hive-interactive-env/hive_aux_jars', '')
   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']

http://git-wip-us.apache.org/repos/asf/ambari/blob/b9063612/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 f5ef902..b14cc8c 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
@@ -202,6 +202,16 @@
     <on-ambari-upgrade add="true"/>
   </property>
   <property>
+    <name>hive_aux_jars</name>
+    <value/>
+    <description>A list of comma separated JARs</description>
+    <display-name>Auxillary JAR list</display-name>
+    <on-ambari-upgrade add="true"/>
+    <value-attributes>
+      <empty-value-valid>true</empty-value-valid>
+    </value-attributes>
+  </property>
+  <property>
     <name>llap_app_name</name>
     <value>llap0</value>
     <description>LLAP app name</description>

Reply via email to