svn commit: r1664732 - in /hive/branches/llap/llap-server: bin/runLlapDaemon.sh src/main/resources/llap.py

[go...@apache.org]

Author: gopalv
Date: Fri Mar  6 22:07:15 2015
New Revision: 1664732

URL: http://svn.apache.org/r1664732
Log:
HIVE-9887: LLAP:  Add LLAP_DAEMON_LD_PATH to add native libs in

Modified:
    hive/branches/llap/llap-server/bin/runLlapDaemon.sh
    hive/branches/llap/llap-server/src/main/resources/llap.py

Modified: hive/branches/llap/llap-server/bin/runLlapDaemon.sh
URL: http://svn.apache.org/viewvc/hive/branches/llap/llap-server/bin/runLlapDaemon.sh?rev=1664732&r1=1664731&r2=1664732&view=diff
==============================================================================
--- hive/branches/llap/llap-server/bin/runLlapDaemon.sh (original)
+++ hive/branches/llap/llap-server/bin/runLlapDaemon.sh Fri Mar  6 22:07:15 2015
@@ -93,6 +93,10 @@ if [ "$LLAP_DAEMON_HEAPSIZE" = "" ]; the
   LLAP_DAEMON_HEAPSIZE=4096
 fi
 
+if [ ! -n "$LLAP_DAEMON_LD_PATH" ]; then
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LLAP_DAEMON_LD_PATH
+fi
+
 # Figure out classes based on the command
 
 if [ "$COMMAND" = "classpath" ] ; then

Modified: hive/branches/llap/llap-server/src/main/resources/llap.py
URL: http://svn.apache.org/viewvc/hive/branches/llap/llap-server/src/main/resources/llap.py?rev=1664732&r1=1664731&r2=1664732&view=diff
==============================================================================
--- hive/branches/llap/llap-server/src/main/resources/llap.py (original)
+++ hive/branches/llap/llap-server/src/main/resources/llap.py Fri Mar  6 22:07:15 2015
@@ -37,7 +37,6 @@ class Llap(Script):
     import params
     env.set_params(params)
     os.environ['JAVA_HOME'] = format('{java64_home}')
-    os.environ['LD_LIBRARY_PATH'] = format('{library_path}')
     # this is the same as TEZ_PREFIX
     os.environ['LLAP_DAEMON_HOME'] = format('{app_root}')
     # this is the location where we have the llap server components (shell scripts)
@@ -47,6 +46,7 @@ class Llap(Script):
     os.environ['LLAP_DAEMON_LOG_DIR'] = format("{app_log_dir}/")
     os.environ['LLAP_DAEMON_HEAPSIZE'] = format("{memory_val}")
     os.environ['LLAP_DAEMON_PID_DIR'] = dirname(format("{pid_file}"))
+    os.environ['LLAP_DAEMON_LD_PATH'] = format('{library_path}')
     print "Debug from LLAP python script"
     print os.environ['LLAP_DAEMON_CONF_DIR']
     self.configure(env)