Repository: incubator-zeppelin Updated Branches: refs/heads/master 74bab2e70 -> 1a4e9ca22
Fix interpreter.sh to get Spark interpreter log file ### What is this PR for? Currently, if users set their own `SPARK_HOME`, they can not get `zeppelin-interpreter-spark-xxxx.log` file. This PR is for fixing this issue. (This issue is reported by weipuz) ### What type of PR is it? Hot Fix ### Todos ### What is the Jira issue? None ### How should this be tested? After applying this PR, 1. Set your own `SPARK_HOME`. 2. Run `sc.version`(or whatever you want) with Spark interpreter. 3. Check under your `ZEPPELIN_HOME/logs/` directory, then you can find `zeppelin-interpreter-spark-xxx.log` file. ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: AhyoungRyu <[email protected]> Closes #769 from AhyoungRyu/fix-spark-log and squashes the following commits: dcdad56 [AhyoungRyu] Ping travis 8564f8c [AhyoungRyu] Fix interpreter.sh to get Spark interpreter log Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/1a4e9ca2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/1a4e9ca2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/1a4e9ca2 Branch: refs/heads/master Commit: 1a4e9ca229cf91ea1f890ce88490daeddaacafbc Parents: 74bab2e Author: AhyoungRyu <[email protected]> Authored: Wed Mar 9 14:55:50 2016 +0900 Committer: Felix Cheung <[email protected]> Committed: Fri Mar 11 15:50:21 2016 -0800 ---------------------------------------------------------------------- bin/interpreter.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/1a4e9ca2/bin/interpreter.sh ---------------------------------------------------------------------- diff --git a/bin/interpreter.sh b/bin/interpreter.sh index b5a6d12..62deba1 100755 --- a/bin/interpreter.sh +++ b/bin/interpreter.sh @@ -19,7 +19,6 @@ bin=$(dirname "${BASH_SOURCE-$0}") bin=$(cd "${bin}">/dev/null; pwd) - function usage() { echo "usage) $0 -p <port> -d <interpreter dir to load> -l <local interpreter repo dir to load>" } @@ -82,7 +81,7 @@ if [[ "${INTERPRETER_ID}" == "spark" ]]; then export SPARK_SUBMIT="${SPARK_HOME}/bin/spark-submit" SPARK_APP_JAR="$(ls ${ZEPPELIN_HOME}/interpreter/spark/zeppelin-spark*.jar)" # This will evantually passes SPARK_APP_JAR to classpath of SparkIMain - ZEPPELIN_CLASSPATH=${SPARK_APP_JAR} + ZEPPELIN_CLASSPATH+=${SPARK_APP_JAR} pattern="$SPARK_HOME/python/lib/py4j-*-src.zip" py4j=($pattern)
