diff --git a/llap-server/bin/runLlapDaemon.sh b/llap-server/bin/runLlapDaemon.sh index 7bc7444..c7ec661 100755 --- a/llap-server/bin/runLlapDaemon.sh +++ b/llap-server/bin/runLlapDaemon.sh @@ -93,6 +93,10 @@ if [ "$LLAP_DAEMON_HEAPSIZE" = "" ]; then 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 diff --git a/llap-server/src/main/resources/llap.py b/llap-server/src/main/resources/llap.py index 6d5bdcd..65c0e9a 100644 --- a/llap-server/src/main/resources/llap.py +++ b/llap-server/src/main/resources/llap.py @@ -37,7 +37,6 @@ def start(self, env): 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 @@ def start(self, env): 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)