Repository: incubator-zeppelin Updated Branches: refs/heads/master 5753d357e -> ec7a59c09
Start zeppelin only with java not spark-submit Since spark agrs are supported through interpreter setting menu in UI, launching zeppelin with spark-submit is not needed anymore. Author: Mina Lee <[email protected]> Closes #90 from minahlee/rm/spark-submit_runner and squashes the following commits: 6c0937c [Mina Lee] Start zeppelin only with java not spark-submit Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/ec7a59c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/ec7a59c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/ec7a59c0 Branch: refs/heads/master Commit: ec7a59c09734df8c1a2d02d7fcb6d629a10988cc Parents: 5753d35 Author: Mina Lee <[email protected]> Authored: Wed Jun 3 20:05:56 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Tue Jun 9 00:03:34 2015 -0700 ---------------------------------------------------------------------- bin/zeppelin.sh | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/ec7a59c0/bin/zeppelin.sh ---------------------------------------------------------------------- diff --git a/bin/zeppelin.sh b/bin/zeppelin.sh index eb2f691..695e751 100755 --- a/bin/zeppelin.sh +++ b/bin/zeppelin.sh @@ -21,10 +21,7 @@ # Run Zeppelin # -function usage() { - echo "Usage: bin/zeppelin.sh [--config <conf-dir>] [spark options] [application options]" - exit 0 -} +USAGE="Usage: bin/zeppelin.sh [--config <conf-dir>]" if [[ "$1" == "--config" ]]; then shift @@ -88,12 +85,4 @@ if [[ ! -d "${ZEPPELIN_NOTEBOOK_DIR}" ]]; then $(mkdir -p "${ZEPPELIN_NOTEBOOK_DIR}") fi -if [[ ! -z "${SPARK_HOME}" ]]; then - source "${SPARK_HOME}/bin/utils.sh" - SUBMIT_USAGE_FUNCTION=usage - gatherSparkSubmitOpts "$@" - ZEPPELIN_RUNNER="${SPARK_HOME}/bin/spark-submit" - $(exec $ZEPPELIN_NICENESS $ZEPPELIN_RUNNER --class $ZEPPELIN_SERVER "${SUBMISSION_OPTS[@]}" --driver-java-options -Dzeppelin.log.file=$ZEPPELIN_LOGFILE spark-shell "${APPLICATION_OPTS[@]}") -else - $(exec $ZEPPELIN_RUNNER $JAVA_OPTS -cp $CLASSPATH $ZEPPELIN_SERVER "$@") -fi +$(exec $ZEPPELIN_RUNNER $JAVA_OPTS -cp $CLASSPATH $ZEPPELIN_SERVER "$@")
