mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
54f4420f9f
### What is this PR for?
This pull request is supposed to fix ZEPPELIN-815. The issue is that one cannot stop Zeppelin by sending a signal, because it starts the runner in a sub shell. The pull request starts the runner in the same process as the `zeppelin.sh`, making it react to signals.
### What type of PR is it?
Improvement
### Todos
None
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-815
### How should this be tested?
- Start `zeppelin.sh`
- Get PID of the `zeppelin.sh` process
- Send SIGINT (`kill -SIGINT <pid>`) to the `zeppelin.sh` process
- Observe that Zeppelin is stopped
### Screenshots
none
### Questions:
* What is the reason to put an exec into a sub shell in the first place?
Author: Frank Rosner <frank@fam-rosner.de>
Closes #844 from FRosner/ZEPPELIN-815 and squashes the following commits:
45896d2 [Frank Rosner] ZEPPELIN-815 don't create a sub shell for the runner
90 lines
2.9 KiB
Bash
Executable file
90 lines
2.9 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}/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
|
|
|
|
if [[ ! -d "${ZEPPELIN_NOTEBOOK_DIR}" ]]; then
|
|
echo "Pid dir doesn't exist, create ${ZEPPELIN_NOTEBOOK_DIR}"
|
|
$(mkdir -p "${ZEPPELIN_NOTEBOOK_DIR}")
|
|
fi
|
|
|
|
exec $ZEPPELIN_RUNNER $JAVA_OPTS -cp $ZEPPELIN_CLASSPATH_OVERRIDES:$CLASSPATH $ZEPPELIN_SERVER "$@"
|