Take ZEPPELIN_JAVA_OPTS as default value of ZEPPELIN_INTP_JAVA_OPTS
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/a3df56a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/a3df56a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/a3df56a2 Branch: refs/heads/master Commit: a3df56a265edd01f2f2d474cb97521c87ff99e64 Parents: 8aa26e8 Author: Lee moon soo <[email protected]> Authored: Fri Mar 13 17:34:13 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Fri Mar 13 17:34:13 2015 +0900 ---------------------------------------------------------------------- bin/common.sh | 7 ++++++- conf/zeppelin-env.sh.template | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/a3df56a2/bin/common.sh ---------------------------------------------------------------------- diff --git a/bin/common.sh b/bin/common.sh index 10d0966..607f358 100644 --- a/bin/common.sh +++ b/bin/common.sh @@ -122,7 +122,12 @@ fi JAVA_OPTS+=" ${ZEPPELIN_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING} ${ZEPPELIN_MEM}" export JAVA_OPTS -if [[ -z "$ZEPPELIN_INTP_MEM" ]]; then +# jvm options for interpreter process +if [[ -z "${ZEPPELIN_INTP_JAVA_OPTS}" ]]; then + export ZEPPELIN_INTP_JAVA_OPTS="${ZEPPELIN_JAVA_OPTS}" +fi + +if [[ -z "${ZEPPELIN_INTP_MEM}" ]]; then export ZEPPELIN_INTP_MEM="${ZEPPELIN_MEM}" fi http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/a3df56a2/conf/zeppelin-env.sh.template ---------------------------------------------------------------------- diff --git a/conf/zeppelin-env.sh.template b/conf/zeppelin-env.sh.template index 704ffe5..576fc06 100644 --- a/conf/zeppelin-env.sh.template +++ b/conf/zeppelin-env.sh.template @@ -4,6 +4,8 @@ # export MASTER= # Spark master url. eg. spark://master_addr:7077. Leave empty if you want to use local mode # export ZEPPELIN_JAVA_OPTS # Additional jvm options. for example, export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g -Dspark.cores.max=16" # export ZEPPELIN_MEM # Zeppelin jvm mem options Default -Xmx1024m -XX:MaxPermSize=512m +# export ZEPPELIN_INTP_MEM # zeppelin interpreter process jvm mem options. Defualt = ZEPPELIN_MEM +# export ZEPPELIN_INTP_JAVA_OPTS # zeppelin interpreter process jvm options. Default = ZEPPELIN_JAVA_OPTS # export ZEPPELIN_CONF_DIR # Alternate zeppelin conf dir. Default is ${ZEPPELIN_HOME}/conf. # export ZEPPELIN_LOG_DIR # Where log files are stored. PWD by default.
