mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
ca7b28adb0
### What is this PR for?
After #1745, zeppelin fail to launch in windows. https://issues.apache.org/jira/browse/ZEPPELIN-1785?focusedCommentId=15754688&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-15754688
This due to the shell script difference between windows and *nix. This PR just remove the checking for ZEPPELIN_NOTEBOOK_DIR as it would be created in JVM side if the dir is not existed. I also remove it from zeppelin.sh for *nix as well.
### What type of PR is it?
[Hot Fix |]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-1785
### How should this be tested?
Tested it manually in windows and mac. Zeppelin can launch successfully on windows/mac even when the notebook dir doesn't exist.
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Jeff Zhang <zjffdu@apache.org>
Closes #1781 from zjffdu/Followup_ZEPPELIN-1785 and squashes the following commits:
2c7c719 [Jeff Zhang] HotFix for zeppelin.cmd
87 lines
3 KiB
Batchfile
87 lines
3 KiB
Batchfile
@echo off
|
|
|
|
REM Licensed to the Apache Software Foundation (ASF) under one or more
|
|
REM contributor license agreements. See the NOTICE file distributed with
|
|
REM this work for additional information regarding copyright ownership.
|
|
REM The ASF licenses this file to You under the Apache License, Version 2.0
|
|
REM (the "License"); you may not use this file except in compliance with
|
|
REM the License. You may obtain a copy of the License at
|
|
REM
|
|
REM http://www.apache.org/licenses/LICENSE-2.0
|
|
REM
|
|
REM Unless required by applicable law or agreed to in writing, software
|
|
REM distributed under the License is distributed on an "AS IS" BASIS,
|
|
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.
|
|
|
|
setlocal enableextensions enabledelayedexpansion
|
|
|
|
set bin=%~dp0
|
|
|
|
if not "%1"=="--config" goto MAIN
|
|
|
|
:SET_CONFIG
|
|
shift
|
|
set conf_dir=%~f1
|
|
shift
|
|
if not exist "%conf_dir%" (
|
|
echo ERROR: %conf_dir% is not a directory
|
|
echo Usage: %~n0 [--config ^<conf-dir^>]
|
|
exit /b 1
|
|
) else (
|
|
set ZEPPELIN_CONF_DIR=%conf_dir%
|
|
)
|
|
|
|
:MAIN
|
|
call "%bin%\common.cmd"
|
|
|
|
set HOSTNAME=%COMPUTERNAME%
|
|
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%"
|
|
|
|
if exist "%ZEPPELIN_HOME%\zeppelin-interpreter\target\classes" (
|
|
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_HOME%\zeppelin-interpreter\target\classes"
|
|
)
|
|
|
|
if exist "%ZEPPELIN_HOME%\zeppelin-zengine\target\classes" (
|
|
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_HOME%\zeppelin-zengine\target\classes"
|
|
)
|
|
|
|
if exist "%ZEPPELIN_HOME%\zeppelin-server\target\classes" (
|
|
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_HOME%\zeppelin-server\target\classes"
|
|
)
|
|
|
|
call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%"
|
|
call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\lib"
|
|
call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\lib\interpreter"
|
|
call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-interpreter\target\lib"
|
|
call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-zengine\target\lib"
|
|
call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-server\target\lib"
|
|
call "%bin%\functions.cmd" ADDJARINDIR "%ZEPPELIN_HOME%\zeppelin-web\target\lib"
|
|
|
|
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%"
|
|
)
|
|
|
|
if not exist %ZEPPELIN_PID_DIR% (
|
|
echo Pid dir doesn't exist, create %ZEPPELIN_PID_DIR%
|
|
mkdir "%ZEPPELIN_PID_DIR%"
|
|
)
|
|
|
|
"%ZEPPELIN_RUNNER%" %JAVA_OPTS% -cp %CLASSPATH% %ZEPPELIN_SERVER% "%*"
|