Repository: zeppelin Updated Branches: refs/heads/master 152538b7e -> dfa1250f9
[HOTFIX] fix interpreter.cmd script ### What is this PR for? interpreter.cmd works incorrect after https://github.com/apache/zeppelin/pull/2562 ### What type of PR is it? Bug Fix ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: tinkoff-dwh <tinkoff....@gmail.com> Closes #2607 from tinkoff-dwh/master and squashes the following commits: 1932202 [tinkoff-dwh] Merge remote-tracking branch 'upstream/master' c7f5124 [tinkoff-dwh] Merge remote-tracking branch 'upstream/master' 8baa87b [tinkoff-dwh] [HOTFIX] fix interpreter.cmd script Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/dfa1250f Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/dfa1250f Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/dfa1250f Branch: refs/heads/master Commit: dfa1250f95e6d8c7601f23b5b116dff8442a21f3 Parents: 152538b Author: tinkoff-dwh <tinkoff....@gmail.com> Authored: Mon Oct 16 11:22:51 2017 +0500 Committer: Jeff Zhang <zjf...@apache.org> Committed: Mon Oct 16 14:41:51 2017 +0800 ---------------------------------------------------------------------- bin/interpreter.cmd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dfa1250f/bin/interpreter.cmd ---------------------------------------------------------------------- diff --git a/bin/interpreter.cmd b/bin/interpreter.cmd index eb59799..8877c45 100644 --- a/bin/interpreter.cmd +++ b/bin/interpreter.cmd @@ -27,6 +27,7 @@ if /I "%~1"=="-d" ( set INTERPRETER_ID=%~n2 ) if /I "%~1"=="-p" set PORT=%~2 +if /I "%~1"=="-c" set CALLBACK_HOST=%~2 if /I "%~1"=="-l" set LOCAL_INTERPRETER_REPO=%~2 shift goto loop @@ -127,11 +128,11 @@ if not defined ZEPPELIN_CLASSPATH_OVERRIDES ( if defined SPARK_SUBMIT ( set JAVA_INTP_OPTS=%JAVA_INTP_OPTS% -Dzeppelin.log.file='%ZEPPELIN_LOGFILE%' - "%SPARK_SUBMIT%" --class %ZEPPELIN_SERVER% --jars %CLASSPATH% --driver-java-options "!JAVA_INTP_OPTS!" %SPARK_SUBMIT_OPTIONS% "%SPARK_APP_JAR%" %PORT% + "%SPARK_SUBMIT%" --class %ZEPPELIN_SERVER% --jars %CLASSPATH% --driver-java-options "!JAVA_INTP_OPTS!" %SPARK_SUBMIT_OPTIONS% "%SPARK_APP_JAR%" "%CALLBACK_HOST%" %PORT% ) else ( set JAVA_INTP_OPTS=%JAVA_INTP_OPTS% -Dzeppelin.log.file="%ZEPPELIN_LOGFILE%" - "%ZEPPELIN_RUNNER%" !JAVA_INTP_OPTS! %ZEPPELIN_INTP_MEM% -cp %ZEPPELIN_CLASSPATH_OVERRIDES%;%CLASSPATH% %ZEPPELIN_SERVER% %PORT% + "%ZEPPELIN_RUNNER%" !JAVA_INTP_OPTS! %ZEPPELIN_INTP_MEM% -cp %ZEPPELIN_CLASSPATH_OVERRIDES%;%CLASSPATH% %ZEPPELIN_SERVER% "%CALLBACK_HOST%" %PORT% ) exit /b
