zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject incubator-zeppelin git commit: ZEPPELIN-305 Do not add jvm memory option when using spark-submit
Date Sat, 12 Dec 2015 22:08:45 GMT
Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 6b69ed4d1 -> b3cca395b


ZEPPELIN-305 Do not add jvm memory option when using spark-submit

https://issues.apache.org/jira/browse/ZEPPELIN-305

When `SPARK_HOME` is defined and `bin/interpreter.sh` is launching interpreter process using
spark-`submit` command, Jvm memory option from `bin/interpreter.sh` and from `spark-submit`
command conflicts.

Author: Lee moon soo <moon@apache.org>

Closes #526 from Leemoonsoo/ZEPPELIN-305 and squashes the following commits:

446b596 [Lee moon soo] Not apply ${ZEPPELIN_INTP_MEM} when using 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/b3cca395
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/b3cca395
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/b3cca395

Branch: refs/heads/master
Commit: b3cca395b7ef5743ea16e28d4d6f56e13c58ae64
Parents: 6b69ed4
Author: Lee moon soo <moon@apache.org>
Authored: Thu Dec 10 12:49:06 2015 +0900
Committer: Lee moon soo <moon@apache.org>
Committed: Sun Dec 13 07:09:53 2015 +0900

----------------------------------------------------------------------
 bin/common.sh      | 4 ++--
 bin/interpreter.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/b3cca395/bin/common.sh
----------------------------------------------------------------------
diff --git a/bin/common.sh b/bin/common.sh
index ae8b0bd..5f20436 100644
--- a/bin/common.sh
+++ b/bin/common.sh
@@ -84,7 +84,7 @@ if [[ -z "${ZEPPELIN_ENCODING}" ]]; then
 fi
 
 if [[ -z "$ZEPPELIN_MEM" ]]; then
-  export ZEPPELIN_MEM="-Xmx1024m -XX:MaxPermSize=512m"
+  export ZEPPELIN_MEM="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m"
 fi
 
 JAVA_OPTS+=" ${ZEPPELIN_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING} ${ZEPPELIN_MEM}"
@@ -99,7 +99,7 @@ if [[ -z "${ZEPPELIN_INTP_MEM}" ]]; then
   export ZEPPELIN_INTP_MEM="${ZEPPELIN_MEM}"
 fi
 
-JAVA_INTP_OPTS+=" ${ZEPPELIN_INTP_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING} ${ZEPPELIN_INTP_MEM}"
+JAVA_INTP_OPTS+=" ${ZEPPELIN_INTP_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING}"
 export JAVA_INTP_OPTS
 
 

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/b3cca395/bin/interpreter.sh
----------------------------------------------------------------------
diff --git a/bin/interpreter.sh b/bin/interpreter.sh
index 91c9b92..464cd9c 100755
--- a/bin/interpreter.sh
+++ b/bin/interpreter.sh
@@ -126,7 +126,7 @@ CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
 if [[ -n "${SPARK_SUBMIT}" ]]; then
     ${SPARK_SUBMIT} --class ${ZEPPELIN_SERVER} --driver-class-path "${ZEPPELIN_CLASSPATH_OVERRIDES}:${CLASSPATH}"
--driver-java-options "${JAVA_INTP_OPTS}" ${SPARK_SUBMIT_OPTIONS} ${SPARK_APP_JAR} ${PORT}
&
 else
-    ${ZEPPELIN_RUNNER} ${JAVA_INTP_OPTS} -cp ${ZEPPELIN_CLASSPATH_OVERRIDES}:${CLASSPATH}
${ZEPPELIN_SERVER} ${PORT} &
+    ${ZEPPELIN_RUNNER} ${JAVA_INTP_OPTS} ${ZEPPELIN_INTP_MEM} -cp ${ZEPPELIN_CLASSPATH_OVERRIDES}:${CLASSPATH}
${ZEPPELIN_SERVER} ${PORT} &
 fi
 
 pid=$!


Mime
View raw message