Repository: zeppelin Updated Branches: refs/heads/master 83469be5b -> 93e37620c
ZEPPELIN-1185. ZEPPELIN_INTP_JAVA_OPTS should not use ZEPPELIN_JAVA_OPTS ### What is this PR for? Don't use ZEPPELIN_JAVA_OPTS as the default value of ZEPPELIN_INTP_JAVA_OPTS ### What type of PR is it? Improvement ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1185 ### How should this be tested? Tested manually. By exporting the following variable, I can debug zeppelin server correctly and remote interpreter process can ran successfully. (Before this PR, the remote interpreter process will fail to launch because it would also listen the same debug port) ``` export ZEPPELIN_JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005" ``` Author: Jeff Zhang <zjf...@apache.org> Closes #1189 from zjffdu/ZEPPELIN-1185 and squashes the following commits: 9e48ad7 [Jeff Zhang] change for windows 3ff5561 [Jeff Zhang] update doc format e82d889 [Jeff Zhang] add migration doc ef5a360 [Jeff Zhang] ZEPPELIN-1185. ZEPPELIN_INTP_JAVA_OPTS should not use ZEPPELIN_JAVA_OPTS as default value Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/93e37620 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/93e37620 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/93e37620 Branch: refs/heads/master Commit: 93e37620c4906ef20c078a640e3cebae60f14d17 Parents: 83469be Author: Jeff Zhang <zjf...@apache.org> Authored: Thu Aug 4 18:16:56 2016 +0800 Committer: Prabhjyot Singh <prabhjyotsi...@gmail.com> Committed: Thu Sep 1 09:30:45 2016 +0530 ---------------------------------------------------------------------- bin/common.cmd | 7 ------- bin/common.sh | 9 --------- conf/zeppelin-env.cmd.template | 4 ++-- conf/zeppelin-env.sh.template | 4 ++-- docs/install/upgrade.md | 8 +++++++- 5 files changed, 11 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/93e37620/bin/common.cmd ---------------------------------------------------------------------- diff --git a/bin/common.cmd b/bin/common.cmd index c84f077..b4fb6bf 100644 --- a/bin/common.cmd +++ b/bin/common.cmd @@ -81,13 +81,6 @@ if not defined JAVA_OPTS ( set JAVA_OPTS=%JAVA_OPTS% %ZEPPELIN_JAVA_OPTS% ) -if not defined ZEPPELIN_INTP_JAVA_OPTS ( - set ZEPPELIN_INTP_JAVA_OPTS=%ZEPPELIN_JAVA_OPTS% -) - -if not defined ZEPPELIN_INTP_MEM ( - set ZEPPELIN_INTP_MEM=%ZEPPELIN_MEM% -) set JAVA_INTP_OPTS=%ZEPPELIN_INTP_JAVA_OPTS% -Dfile.encoding=%ZEPPELIN_ENCODING% http://git-wip-us.apache.org/repos/asf/zeppelin/blob/93e37620/bin/common.sh ---------------------------------------------------------------------- diff --git a/bin/common.sh b/bin/common.sh index 592aa1c..b69f28c 100644 --- a/bin/common.sh +++ b/bin/common.sh @@ -121,15 +121,6 @@ JAVA_OPTS+=" ${ZEPPELIN_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING} ${ZEPPEL JAVA_OPTS+=" -Dlog4j.configuration=file://${ZEPPELIN_CONF_DIR}/log4j.properties" export JAVA_OPTS -# 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 - JAVA_INTP_OPTS="${ZEPPELIN_INTP_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING}" JAVA_INTP_OPTS+=" -Dlog4j.configuration=file://${ZEPPELIN_CONF_DIR}/log4j.properties" export JAVA_INTP_OPTS http://git-wip-us.apache.org/repos/asf/zeppelin/blob/93e37620/conf/zeppelin-env.cmd.template ---------------------------------------------------------------------- diff --git a/conf/zeppelin-env.cmd.template b/conf/zeppelin-env.cmd.template index fd42b32..4d697fc 100644 --- a/conf/zeppelin-env.cmd.template +++ b/conf/zeppelin-env.cmd.template @@ -20,8 +20,8 @@ REM set JAVA_HOME= REM set MASTER= REM Spark master url. eg. spark://master_addr:7077. Leave empty if you want to use local mode. REM set ZEPPELIN_JAVA_OPTS REM Additional jvm options. for example, set ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g -Dspark.cores.max=16" REM set ZEPPELIN_MEM REM Zeppelin jvm mem options Default -Xmx1024m -XX:MaxPermSize=512m -REM set ZEPPELIN_INTP_MEM REM zeppelin interpreter process jvm mem options. Default = ZEPPELIN_MEM -REM set ZEPPELIN_INTP_JAVA_OPTS REM zeppelin interpreter process jvm options. Default = ZEPPELIN_JAVA_OPTS +REM set ZEPPELIN_INTP_MEM REM zeppelin interpreter process jvm mem options. +REM set ZEPPELIN_INTP_JAVA_OPTS REM zeppelin interpreter process jvm options. REM set ZEPPELIN_LOG_DIR REM Where log files are stored. PWD by default. REM set ZEPPELIN_PID_DIR REM The pid files are stored. /tmp by default. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/93e37620/conf/zeppelin-env.sh.template ---------------------------------------------------------------------- diff --git a/conf/zeppelin-env.sh.template b/conf/zeppelin-env.sh.template index a247ed5..01c6d53 100644 --- a/conf/zeppelin-env.sh.template +++ b/conf/zeppelin-env.sh.template @@ -20,8 +20,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. Default = ZEPPELIN_MEM -# export ZEPPELIN_INTP_JAVA_OPTS # zeppelin interpreter process jvm options. Default = ZEPPELIN_JAVA_OPTS +# export ZEPPELIN_INTP_MEM # zeppelin interpreter process jvm mem options. +# export ZEPPELIN_INTP_JAVA_OPTS # zeppelin interpreter process jvm options. # export ZEPPELIN_LOG_DIR # Where log files are stored. PWD by default. # export ZEPPELIN_PID_DIR # The pid files are stored. ${ZEPPELIN_HOME}/run by default. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/93e37620/docs/install/upgrade.md ---------------------------------------------------------------------- diff --git a/docs/install/upgrade.md b/docs/install/upgrade.md index 850e827..16e96e8 100644 --- a/docs/install/upgrade.md +++ b/docs/install/upgrade.md @@ -43,4 +43,10 @@ So, copying `notebook` and `conf` directory should be enough. ``` bin/zeppelin-daemon.sh start - ``` \ No newline at end of file + ``` + +## Migration Guide + +### Upgrading from Zeppelin 0.6 to 0.7 + + - From 0.7, we don't use `ZEPPELIN_JAVA_OPTS` as default value of `ZEPPELIN_INTP_JAVA_OPTS` and also the same for `ZEPPELIN_MEM`/`ZEPPELIN_INTP_MEM`. If user want to configure the jvm opts of interpreter process, please set `ZEPPELIN_INTP_JAVA_OPTS` and `ZEPPELIN_INTP_MEM` explicitly. \ No newline at end of file
