You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2015/11/12 03:49:20 UTC
incubator-zeppelin git commit: ZEPPELIN-383 Override classpath with
ZEPPELIN_CLASSPATH_OVERRIDES
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 082eae16d -> 748533b2a
ZEPPELIN-383 Override classpath with ZEPPELIN_CLASSPATH_OVERRIDES
Prepend ZEPPELIN_CLASSPATH_OVERRIDES environment variable when building CLASSPATH in the shell scripts.
This PR replaces the closed #398 and #386 - Sorry for the mess...
Author: Eric Charles <er...@datalayer.io>
Closes #412 from echarles/ZEPPELIN-383-CLASSPATH_OVERRIDES and squashes the following commits:
8572ec5 [Eric Charles] Use ZEPPELIN_CLASSPATH_OVERRIDES instead of CLASSPATH_OVERRIDES
d63cc55 [Eric Charles] Prepend CLASSPATH_OVERRIDES environment variable when building CLASSPATH in the shell scripts
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/748533b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/748533b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/748533b2
Branch: refs/heads/master
Commit: 748533b2a592280d0b276112d537bef679ab7f0e
Parents: 082eae1
Author: Eric Charles <er...@datalayer.io>
Authored: Mon Nov 9 17:30:31 2015 +0100
Committer: Lee moon soo <mo...@apache.org>
Committed: Thu Nov 12 11:49:35 2015 +0900
----------------------------------------------------------------------
bin/interpreter.sh | 4 ++--
bin/zeppelin-daemon.sh | 2 +-
bin/zeppelin.sh | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/748533b2/bin/interpreter.sh
----------------------------------------------------------------------
diff --git a/bin/interpreter.sh b/bin/interpreter.sh
index e03a13b..7a21b3e 100755
--- a/bin/interpreter.sh
+++ b/bin/interpreter.sh
@@ -121,9 +121,9 @@ fi
CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
if [[ -n "${SPARK_SUBMIT}" ]]; then
- ${SPARK_SUBMIT} --class ${ZEPPELIN_SERVER} --driver-class-path "${CLASSPATH}" --driver-java-options "${JAVA_INTP_OPTS}" ${SPARK_SUBMIT_OPTIONS} ${SPARK_APP_JAR} ${PORT} &
+ ${SPARK_SUBMIT} --class ${ZEPPELIN_SERVER} --driver-class-path "${ZEPPELIN_CLASSPATH_OVERRIDESS}:${CLASSPATH}" --driver-java-options "${JAVA_INTP_OPTS}" ${SPARK_SUBMIT_OPTIONS} ${SPARK_APP_JAR} ${PORT} &
else
- ${ZEPPELIN_RUNNER} ${JAVA_INTP_OPTS} -cp ${CLASSPATH} ${ZEPPELIN_SERVER} ${PORT} &
+ ${ZEPPELIN_RUNNER} ${JAVA_INTP_OPTS} -cp ${ZEPPELIN_CLASSPATH_OVERRIDESS}:${CLASSPATH} ${ZEPPELIN_SERVER} ${PORT} &
fi
pid=$!
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/748533b2/bin/zeppelin-daemon.sh
----------------------------------------------------------------------
diff --git a/bin/zeppelin-daemon.sh b/bin/zeppelin-daemon.sh
index a386f27..6e08089 100755
--- a/bin/zeppelin-daemon.sh
+++ b/bin/zeppelin-daemon.sh
@@ -169,7 +169,7 @@ function start() {
initialize_default_directories
- nohup nice -n $ZEPPELIN_NICENESS $ZEPPELIN_RUNNER $JAVA_OPTS -cp $CLASSPATH $ZEPPELIN_MAIN >> "${ZEPPELIN_OUTFILE}" 2>&1 < /dev/null &
+ nohup nice -n $ZEPPELIN_NICENESS $ZEPPELIN_RUNNER $JAVA_OPTS -cp $ZEPPELIN_CLASSPATH_OVERRIDES:$CLASSPATH $ZEPPELIN_MAIN >> "${ZEPPELIN_OUTFILE}" 2>&1 < /dev/null &
pid=$!
if [[ -z "${pid}" ]]; then
action_msg "${ZEPPELIN_NAME} start" "${SET_ERROR}"
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/748533b2/bin/zeppelin.sh
----------------------------------------------------------------------
diff --git a/bin/zeppelin.sh b/bin/zeppelin.sh
index 695e751..17950e8 100755
--- a/bin/zeppelin.sh
+++ b/bin/zeppelin.sh
@@ -85,4 +85,4 @@ if [[ ! -d "${ZEPPELIN_NOTEBOOK_DIR}" ]]; then
$(mkdir -p "${ZEPPELIN_NOTEBOOK_DIR}")
fi
-$(exec $ZEPPELIN_RUNNER $JAVA_OPTS -cp $CLASSPATH $ZEPPELIN_SERVER "$@")
+$(exec $ZEPPELIN_RUNNER $JAVA_OPTS -cp $ZEPPELIN_CLASSPATH_OVERRIDES:$CLASSPATH $ZEPPELIN_SERVER "$@")