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
86 lines
2.8 KiB
Bash
Executable file
86 lines
2.8 KiB
Bash
Executable file
#!/bin/bash
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance
|
|
# with the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
# Run Zeppelin
|
|
#
|
|
|
|
USAGE="Usage: bin/zeppelin.sh [--config <conf-dir>]"
|
|
|
|
if [[ "$1" == "--config" ]]; then
|
|
shift
|
|
conf_dir="$1"
|
|
if [[ ! -d "${conf_dir}" ]]; then
|
|
echo "ERROR : ${conf_dir} is not a directory"
|
|
echo ${USAGE}
|
|
exit 1
|
|
else
|
|
export ZEPPELIN_CONF_DIR="${conf_dir}"
|
|
fi
|
|
shift
|
|
fi
|
|
|
|
bin=$(dirname "${BASH_SOURCE-$0}")
|
|
bin=$(cd "${bin}">/dev/null; pwd)
|
|
|
|
. "${bin}/common.sh"
|
|
|
|
if [ "$1" == "--version" ] || [ "$1" == "-v" ]; then
|
|
getZeppelinVersion
|
|
fi
|
|
|
|
HOSTNAME=$(hostname)
|
|
ZEPPELIN_LOGFILE="${ZEPPELIN_LOG_DIR}/zeppelin-${ZEPPELIN_IDENT_STRING}-${HOSTNAME}.log"
|
|
LOG="${ZEPPELIN_LOG_DIR}/zeppelin-cli-${ZEPPELIN_IDENT_STRING}-${HOSTNAME}.out"
|
|
|
|
ZEPPELIN_SERVER=org.apache.zeppelin.server.ZeppelinServer
|
|
JAVA_OPTS+=" -Dzeppelin.log.file=${ZEPPELIN_LOGFILE}"
|
|
|
|
# construct classpath
|
|
if [[ -d "${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes" ]]; then
|
|
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-interpreter/target/classes"
|
|
fi
|
|
|
|
if [[ -d "${ZEPPELIN_HOME}/zeppelin-zengine/target/classes" ]]; then
|
|
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-zengine/target/classes"
|
|
fi
|
|
|
|
if [[ -d "${ZEPPELIN_HOME}/zeppelin-server/target/classes" ]]; then
|
|
ZEPPELIN_CLASSPATH+=":${ZEPPELIN_HOME}/zeppelin-server/target/classes"
|
|
fi
|
|
|
|
addJarInDir "${ZEPPELIN_HOME}"
|
|
addJarInDir "${ZEPPELIN_HOME}/lib"
|
|
addJarInDir "${ZEPPELIN_HOME}/lib/interpreter"
|
|
addJarInDir "${ZEPPELIN_HOME}/zeppelin-interpreter/target/lib"
|
|
addJarInDir "${ZEPPELIN_HOME}/zeppelin-zengine/target/lib"
|
|
addJarInDir "${ZEPPELIN_HOME}/zeppelin-server/target/lib"
|
|
addJarInDir "${ZEPPELIN_HOME}/zeppelin-web/target/lib"
|
|
|
|
CLASSPATH+=":${ZEPPELIN_CLASSPATH}"
|
|
|
|
if [[ ! -d "${ZEPPELIN_LOG_DIR}" ]]; then
|
|
echo "Log dir doesn't exist, create ${ZEPPELIN_LOG_DIR}"
|
|
$(mkdir -p "${ZEPPELIN_LOG_DIR}")
|
|
fi
|
|
|
|
if [[ ! -d "${ZEPPELIN_PID_DIR}" ]]; then
|
|
echo "Pid dir doesn't exist, create ${ZEPPELIN_PID_DIR}"
|
|
$(mkdir -p "${ZEPPELIN_PID_DIR}")
|
|
fi
|
|
|
|
exec $ZEPPELIN_RUNNER $JAVA_OPTS -cp $ZEPPELIN_CLASSPATH_OVERRIDES:$CLASSPATH $ZEPPELIN_SERVER "$@"
|