You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by js...@apache.org on 2020/03/26 06:07:54 UTC
[incubator-livy] branch master updated: [LIVY-751] Livy server
should allow to customize LIVY_CLASSPATH
This is an automated email from the ASF dual-hosted git repository.
jshao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-livy.git
The following commit(s) were added to refs/heads/master by this push:
new e39d8fe [LIVY-751] Livy server should allow to customize LIVY_CLASSPATH
e39d8fe is described below
commit e39d8fee43adbddf88acb2e04b470aa14b713785
Author: Shingo Furuyama <sf...@sfuruyam2.ssk.ynwm.yahoo.co.jp>
AuthorDate: Thu Mar 26 14:07:42 2020 +0800
[LIVY-751] Livy server should allow to customize LIVY_CLASSPATH
## What changes were proposed in this pull request?
The purpose and background is https://issues.apache.org/jira/browse/LIVY-751
## How was this patch tested?
I tested the following two manually.
1. To confirm there is no degradation, I run 0.7.0-incubating livy server with sources in this PR. I also run an example jobs, and it completed without error.
2. To confirm our workaround works, I build 0.7.0-incubating branch with specifying `-Dhadoop.scope=provided` and sources with this PR. After that, I added `export LIVY_CLASSPATH="$LIVY_HOME/jars/*:$(hadoop classpath)"` in conf/livy-env.sh and boot livy server. I also run an example jobs, and it completed without error.
Author: Shingo Furuyama <sf...@sfuruyam2.ssk.ynwm.yahoo.co.jp>
Author: Shingo Furuyama <sf...@yahoo-corp.jp>
Closes #282 from marblejenka/livy-classpath.
---
bin/livy-server | 2 +-
conf/livy-env.sh.template | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/bin/livy-server b/bin/livy-server
index 8d27d4e..a0e2fb7 100755
--- a/bin/livy-server
+++ b/bin/livy-server
@@ -90,7 +90,7 @@ start_livy_server() {
fi
fi
- LIVY_CLASSPATH="$LIBDIR/*:$LIVY_CONF_DIR"
+ LIVY_CLASSPATH="${LIVY_CLASSPATH:-${LIBDIR}/*:${LIVY_CONF_DIR}}"
if [ -n "$SPARK_CONF_DIR" ]; then
LIVY_CLASSPATH="$LIVY_CLASSPATH:$SPARK_CONF_DIR"
diff --git a/conf/livy-env.sh.template b/conf/livy-env.sh.template
index 7cba5c3..14f22c3 100644
--- a/conf/livy-env.sh.template
+++ b/conf/livy-env.sh.template
@@ -30,3 +30,4 @@
# names. (Default: name of the user starting Livy).
# - LIVY_MAX_LOG_FILES Max number of log file to keep in the log directory. (Default: 5.)
# - LIVY_NICENESS Niceness of the Livy server process when running in the background. (Default: 0.)
+# - LIVY_CLASSPATH Override if the additional classpath is required.