mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
Fixes to handle spaces in paths properly, both for ZEPPELIN_HOME and CLASSPATH
This commit is contained in:
Silvio Fiorito
parent
73aaf4f7d2
commit
8aadd45762
4 changed files with 63 additions and 61 deletions
|
|
@ -15,29 +15,29 @@ REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|||
REM See the License for the specific language governing permissions and
|
||||
REM limitations under the License.
|
||||
|
||||
if "%ZEPPELIN_HOME%"=="" (
|
||||
for %%d in (%~dp0..) do (
|
||||
if not defined ZEPPELIN_HOME (
|
||||
for %%d in ("%~dp0..") do (
|
||||
set ZEPPELIN_HOME=%%~fd
|
||||
)
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_CONF_DIR%"=="" (
|
||||
if not defined ZEPPELIN_CONF_DIR (
|
||||
set ZEPPELIN_CONF_DIR=%ZEPPELIN_HOME%\conf
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_LOG_DIR%"=="" (
|
||||
if not defined ZEPPELIN_LOG_DIR (
|
||||
set ZEPPELIN_LOG_DIR=%ZEPPELIN_HOME%\logs
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_NOTEBOOK_DIR%"=="" (
|
||||
if not defined ZEPPELIN_NOTEBOOK_DIR (
|
||||
set ZEPPELIN_NOTEBOOK_DIR=%ZEPPELIN_HOME%\notebook
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_PID_DIR%"=="" (
|
||||
if not defined ZEPPELIN_PID_DIR (
|
||||
set ZEPPELIN_PID_DIR=%ZEPPELIN_HOME%\run
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_WAR%"=="" (
|
||||
if not defined ZEPPELIN_WAR (
|
||||
if exist "%ZEPPELIN_HOME%\zeppelin-web\dist" (
|
||||
set ZEPPELIN_WAR=%ZEPPELIN_HOME%\zeppelin-web\dist
|
||||
) else (
|
||||
|
|
@ -47,65 +47,65 @@ if "%ZEPPELIN_WAR%"=="" (
|
|||
)
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_INTERPRETER_DIR%"=="" (
|
||||
if not defined ZEPPELIN_INTERPRETER_DIR (
|
||||
set ZEPPELIN_INTERPRETER_DIR=%ZEPPELIN_HOME%\interpreter
|
||||
)
|
||||
|
||||
if exist "%ZEPPELIN_CONF_DIR%\zeppelin-env.cmd" (
|
||||
call %ZEPPELIN_CONF_DIR%\zeppelin-env.cmd
|
||||
call "%ZEPPELIN_CONF_DIR%\zeppelin-env.cmd"
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_CLASSPATH%"=="" (
|
||||
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CONF_DIR%
|
||||
if not defined ZEPPELIN_CLASSPATH (
|
||||
set ZEPPELIN_CLASSPATH="%ZEPPELIN_CONF_DIR%"
|
||||
) else (
|
||||
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;%ZEPPELIN_CONF_DIR%
|
||||
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_CONF_DIR%"
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_ENCODING%"=="" (
|
||||
if not defined ZEPPELIN_ENCODING (
|
||||
set ZEPPELIN_ENCODING=UTF-8
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_MEM%"=="" (
|
||||
if not defined ZEPPELIN_MEM (
|
||||
set ZEPPELIN_MEM=-Xms1024m -Xmx1024m -XX:MaxPermSize=512m
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_JAVA_OPTS%"=="" (
|
||||
if not defined ZEPPELIN_JAVA_OPTS (
|
||||
set ZEPPELIN_JAVA_OPTS=-Dfile.encoding=%ZEPPELIN_ENCODING% %ZEPPELIN_MEM%
|
||||
) else (
|
||||
set ZEPPELIN_JAVA_OPTS=%ZEPPELIN_JAVA_OPTS% -Dfile.encoding=%ZEPPELIN_ENCODING% %ZEPPELIN_MEM%
|
||||
)
|
||||
|
||||
if "%JAVA_OPTS%"=="" (
|
||||
if not defined JAVA_OPTS (
|
||||
set JAVA_OPTS=%ZEPPELIN_JAVA_OPTS%
|
||||
) else (
|
||||
set JAVA_OPTS=%JAVA_OPTS% %ZEPPELIN_JAVA_OPTS%
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_INTP_JAVA_OPTS%"=="" (
|
||||
if not defined ZEPPELIN_INTP_JAVA_OPTS (
|
||||
set ZEPPELIN_INTP_JAVA_OPTS=%ZEPPELIN_JAVA_OPTS%
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_INTP_MEM%"=="" (
|
||||
if not defined ZEPPELIN_INTP_MEM (
|
||||
set ZEPPELIN_INTP_MEM=%ZEPPELIN_MEM%
|
||||
)
|
||||
|
||||
set JAVA_INTP_OPTS=%ZEPPELIN_INTP_JAVA_OPTS% -Dfile.encoding=%ZEPPELIN_ENCODING%
|
||||
|
||||
if "%JAVA_HOME%"=="" (
|
||||
if not defined JAVA_HOME (
|
||||
set ZEPPELIN_RUNNER=java
|
||||
) else (
|
||||
set ZEPPELIN_RUNNER=%JAVA_HOME%\bin\java
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_IDENT_STRING%"=="" (
|
||||
if not defined ZEPPELIN_IDENT_STRING (
|
||||
set ZEPPELIN_IDENT_STRING=%USERNAME%
|
||||
)
|
||||
|
||||
if "%DEBUG%"=="" (
|
||||
if not defined DEBUG (
|
||||
set DEBUG=0
|
||||
)
|
||||
|
||||
if "%ZEPPELIN_INTERPRETER_REMOTE_RUNNER%"=="" (
|
||||
if not defined ZEPPELIN_INTERPRETER_REMOTE_RUNNER (
|
||||
set ZEPPELIN_INTERPRETER_REMOTE_RUNNER=bin\interpreter.cmd
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -21,18 +21,18 @@ exit /b
|
|||
|
||||
:ADDEACHJARINDIR
|
||||
for %%d in ("%~2\*.jar") do (
|
||||
set ZEPPELIN_CLASSPATH=%%d;!ZEPPELIN_CLASSPATH!
|
||||
set ZEPPELIN_CLASSPATH="%%d";!ZEPPELIN_CLASSPATH!
|
||||
)
|
||||
exit /b
|
||||
|
||||
:ADDEACHJARINDIRRECURSIVE
|
||||
for /r "%~2" %%d in (*.jar) do (
|
||||
set ZEPPELIN_CLASSPATH=%%d;!ZEPPELIN_CLASSPATH!
|
||||
set ZEPPELIN_CLASSPATH="%%d";!ZEPPELIN_CLASSPATH!
|
||||
)
|
||||
exit /b
|
||||
|
||||
:ADDJARINDIR
|
||||
if exist "%~2" (
|
||||
set ZEPPELIN_CLASSPATH=%~2\*;%ZEPPELIN_CLASSPATH%
|
||||
set ZEPPELIN_CLASSPATH="%~2\*";%ZEPPELIN_CLASSPATH%
|
||||
)
|
||||
exit /b
|
||||
|
|
|
|||
|
|
@ -37,15 +37,13 @@ if "%INTERPRETER_DIR%"=="" goto usage
|
|||
|
||||
call "%bin%\common.cmd"
|
||||
|
||||
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;%ZEPPELIN_CONF_DIR%
|
||||
|
||||
if exist "%ZEPPELIN_HOME%\zeppelin-interpreter\target\classes" (
|
||||
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;%ZEPPELIN_HOME%\zeppelin-interpreter\target\classes
|
||||
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_HOME%\zeppelin-interpreter\target\classes"
|
||||
) else (
|
||||
for %%d in ("%ZEPPELIN_HOME%\lib\zeppelin-interpreter*.jar") do (
|
||||
set ZEPPELIN_INTERPRETER_JAR=%%d
|
||||
)
|
||||
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;!ZEPPELIN_INTERPRETER_JAR!
|
||||
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"!ZEPPELIN_INTERPRETER_JAR!"
|
||||
)
|
||||
|
||||
call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-interpreter\target\lib"
|
||||
|
|
@ -55,32 +53,31 @@ set HOSTNAME=%COMPUTERNAME%
|
|||
set ZEPPELIN_SERVER=org.apache.zeppelin.interpreter.remote.RemoteInterpreterServer
|
||||
|
||||
set ZEPPELIN_LOGFILE=%ZEPPELIN_LOG_DIR%\zeppelin-interpreter-%INTERPRETER_ID%-%ZEPPELIN_IDENT_STRING%-%HOSTNAME%.log
|
||||
set JAVA_INTP_OPTS=%JAVA_INTP_OPTS% -Dzeppelin.log.file=%ZEPPELIN_LOGFILE%
|
||||
|
||||
if not exist "%ZEPPELIN_LOG_DIR%" (
|
||||
echo Log dir doesn't exist, create %ZEPPELIN_LOG_DIR%
|
||||
mkdir %ZEPPELIN_LOG_DIR%
|
||||
mkdir "%ZEPPELIN_LOG_DIR%"
|
||||
)
|
||||
|
||||
if /I "%INTERPRETER_ID%"=="spark" (
|
||||
if not "%SPARK_HOME%"=="" (
|
||||
if defined SPARK_HOME (
|
||||
set SPARK_SUBMIT=%SPARK_HOME%\bin\spark-submit.cmd
|
||||
for %%d in ("%ZEPPELIN_HOME%\interpreter\spark\zeppelin-spark*.jar") do (
|
||||
set SPARK_APP_JAR=%%d
|
||||
)
|
||||
set ZEPPELIN_CLASSPATH=!SPARK_APP_JAR!
|
||||
set ZEPPELIN_CLASSPATH="!SPARK_APP_JAR!"
|
||||
|
||||
for %%d in ("%SPARK_HOME%\python\lib\py4j-*-src.zip") do (
|
||||
set py4j=%%d
|
||||
)
|
||||
|
||||
if "%PYTHONPATH%"=="" (
|
||||
if not defined PYTHONPATH (
|
||||
set PYTHONPATH=!py4j!;%SPARK_HOME%\python
|
||||
) else (
|
||||
set PYTHONPATH=!py4j!;%SPARK_HOME%\python;%PYTHONPATH%
|
||||
)
|
||||
) else (
|
||||
if not "%HADOOP_HOME%"=="" if exist "%HADOOP_HOME%\bin\hadoop.cmd" (
|
||||
if defined HADOOP_HOME if exist "%HADOOP_HOME%\bin\hadoop.cmd" (
|
||||
for /f "tokens=*" %%d in ('"%HADOOP_HOME%\bin\hadoop.cmd" classpath') do (
|
||||
set LOCAL_HADOOP_CLASSPATH=%%d
|
||||
)
|
||||
|
|
@ -95,7 +92,7 @@ if /I "%INTERPRETER_ID%"=="spark" (
|
|||
|
||||
set PYSPARKPATH=%ZEPPELIN_HOME%\interpreter\spark\pyspark\pyspark.zip;!py4j!
|
||||
|
||||
if "%PYTHONPATH%"=="" (
|
||||
if not defined PYTHONPATH (
|
||||
set PYTHONPATH=!PYSPARKPATH!
|
||||
) else (
|
||||
set PYTHONPATH=%PYTHONPATH%;!PYSPARKPATH!
|
||||
|
|
@ -103,34 +100,34 @@ if /I "%INTERPRETER_ID%"=="spark" (
|
|||
|
||||
set PYSPARKPATH=
|
||||
|
||||
if not "%HADOOP_HOME%"=="" if "%HADOOP_CONF_DIR%"=="" (
|
||||
if defined HADOOP_HOME if not defined HADOOP_CONF_DIR (
|
||||
if exist "%HADOOP_HOME%\etc\hadoop" (
|
||||
set HADOOP_CONF_DIR=%HADOOP_HOME%\etc\hadoop
|
||||
) else if exist "/etc/hadoop/conf" (
|
||||
set HADOOP_CONF_DIR=/etc/hadoop/conf
|
||||
)
|
||||
)
|
||||
|
||||
if exist "%HADOOP_CONF_DIR%" (
|
||||
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;%HADOOP_CONF_DIR%
|
||||
)
|
||||
|
||||
if "%SPARK_CLASSPATH%"=="" (
|
||||
set SPARK_CLASSPATH=%ZEPPELIN_CLASSPATH%
|
||||
) else (
|
||||
set SPARK_CLASSPATH=%SPARK_CLASSPATH%;%ZEPPELIN_CLASSPATH%
|
||||
)
|
||||
)
|
||||
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%HADOOP_CONF_DIR%"
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
call "%bin%\functions.cmd" ADDJARINDIR "%LOCAL_INTERPRETER_REPO%"
|
||||
|
||||
set CLASSPATH=%ZEPPELIN_CLASSPATH%
|
||||
|
||||
if not "%SPARK_SUBMIT%"=="" (
|
||||
"%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%
|
||||
if not defined ZEPPELIN_CLASSPATH_OVERRIDES (
|
||||
set CLASSPATH=%ZEPPELIN_CLASSPATH%
|
||||
) else (
|
||||
"%ZEPPELIN_RUNNER%" %JAVA_INTP_OPTS% %ZEPPELIN_INTP_MEM% -cp %ZEPPELIN_CLASSPATH_OVERRIDES%;%CLASSPATH% %ZEPPELIN_SERVER% %PORT%
|
||||
set CLASSPATH=%ZEPPELIN_CLASSPATH_OVERRIDES%;%ZEPPELIN_CLASSPATH%
|
||||
)
|
||||
|
||||
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%
|
||||
) 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%
|
||||
)
|
||||
|
||||
exit /b
|
||||
|
|
|
|||
|
|
@ -37,11 +37,10 @@ if not exist "%conf_dir%" (
|
|||
call "%bin%\common.cmd"
|
||||
|
||||
set HOSTNAME=%COMPUTERNAME%
|
||||
set ZEPPELIN_LOGFILE="%ZEPPELIN_LOG_DIR%\zeppelin-%ZEPPELIN_IDENT_STRING%-%HOSTNAME%.log"
|
||||
set LOG="%ZEPPELIN_LOG_DIR%\zeppelin-cli-%ZEPPELIN_IDENT_STRING%-%HOSTNAME%.out"
|
||||
set ZEPPELIN_LOGFILE=%ZEPPELIN_LOG_DIR%\zeppelin-%ZEPPELIN_IDENT_STRING%-%HOSTNAME%.log
|
||||
|
||||
set ZEPPELIN_SERVER=org.apache.zeppelin.server.ZeppelinServer
|
||||
set JAVA_OPTS=%JAVA_OPTS% -Dzeppelin.log.file=%ZEPPELIN_LOGFILE%
|
||||
set JAVA_OPTS=%JAVA_OPTS% -Dzeppelin.log.file="%ZEPPELIN_LOGFILE%"
|
||||
|
||||
if exist "%ZEPPELIN_HOME%\zeppelin-interpreter\target\classes" (
|
||||
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_HOME%\zeppelin-interpreter\target\classes"
|
||||
|
|
@ -62,25 +61,31 @@ call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-zengine\target\
|
|||
call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-server\target\lib"
|
||||
call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-web\target\lib"
|
||||
|
||||
if "%CLASSPATH%"=="" (
|
||||
if not defined CLASSPATH (
|
||||
set CLASSPATH=%ZEPPELIN_CLASSPATH%
|
||||
) else (
|
||||
set CLASSPATH=%CLASSPATH%;%ZEPPELIN_CLASSPATH%
|
||||
)
|
||||
|
||||
if not defined ZEPPELIN_CLASSPATH_OVERRIDES (
|
||||
set CLASSPATH=%ZEPPELIN_CLASSPATH%
|
||||
) else (
|
||||
set CLASSPATH=%ZEPPELIN_CLASSPATH_OVERRIDES%;%ZEPPELIN_CLASSPATH%
|
||||
)
|
||||
|
||||
if not exist %ZEPPELIN_LOG_DIR% (
|
||||
echo Log dir doesn't exist, create %ZEPPELIN_LOG_DIR%
|
||||
mkdir %ZEPPELIN_LOG_DIR%
|
||||
mkdir "%ZEPPELIN_LOG_DIR%"
|
||||
)
|
||||
|
||||
if not exist %ZEPPELIN_PID_DIR% (
|
||||
echo Pid dir doesn't exist, create %ZEPPELIN_PID_DIR%
|
||||
mkdir %ZEPPELIN_PID_DIR%
|
||||
mkdir "%ZEPPELIN_PID_DIR%"
|
||||
)
|
||||
|
||||
if not exist %ZEPPELIN_NOTEBOOK_DIR% (
|
||||
echo Notebook dir doesn't exist, create %ZEPPELIN_NOTEBOOK_DIR%
|
||||
mkdir %ZEPPELIN_NOTEBOOK_DIR%
|
||||
mkdir "%ZEPPELIN_NOTEBOOK_DIR%"
|
||||
)
|
||||
|
||||
"%ZEPPELIN_RUNNER%" %JAVA_OPTS% -cp %ZEPPELIN_CLASSPATH_OVERRIDES%;%CLASSPATH% %ZEPPELIN_SERVER% "%*"
|
||||
"%ZEPPELIN_RUNNER%" %JAVA_OPTS% -cp %CLASSPATH% %ZEPPELIN_SERVER% "%*"
|
||||
|
|
|
|||
Loading…
Reference in a new issue