Repository: incubator-zeppelin Updated Branches: refs/heads/master a6c8b5fcb -> 54f4420f9
ZEPPELIN-815 don't create a sub shell for the runner ### 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 <[email protected]> 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 Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/54f4420f Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/54f4420f Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/54f4420f Branch: refs/heads/master Commit: 54f4420f9ffd30cf164d733816fa9127d0508d15 Parents: a6c8b5f Author: Frank Rosner <[email protected]> Authored: Tue Apr 19 20:04:44 2016 +0200 Committer: Felix Cheung <[email protected]> Committed: Fri Apr 22 19:51:22 2016 -0700 ---------------------------------------------------------------------- bin/zeppelin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/54f4420f/bin/zeppelin.sh ---------------------------------------------------------------------- diff --git a/bin/zeppelin.sh b/bin/zeppelin.sh index e93c715..92d7f7e 100755 --- a/bin/zeppelin.sh +++ b/bin/zeppelin.sh @@ -87,4 +87,4 @@ if [[ ! -d "${ZEPPELIN_NOTEBOOK_DIR}" ]]; then $(mkdir -p "${ZEPPELIN_NOTEBOOK_DIR}") fi -$(exec $ZEPPELIN_RUNNER $JAVA_OPTS -cp $ZEPPELIN_CLASSPATH_OVERRIDES:$CLASSPATH $ZEPPELIN_SERVER "$@") +exec $ZEPPELIN_RUNNER $JAVA_OPTS -cp $ZEPPELIN_CLASSPATH_OVERRIDES:$CLASSPATH $ZEPPELIN_SERVER "$@"
