You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2016/12/19 18:41:00 UTC
zeppelin git commit: Followup for ZEPPELIN-1785
Repository: zeppelin
Updated Branches:
refs/heads/master 44c800f09 -> ca7b28adb
Followup for ZEPPELIN-1785
### 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 <zj...@apache.org>
Closes #1781 from zjffdu/Followup_ZEPPELIN-1785 and squashes the following commits:
2c7c719 [Jeff Zhang] HotFix for zeppelin.cmd
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/ca7b28ad
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/ca7b28ad
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/ca7b28ad
Branch: refs/heads/master
Commit: ca7b28adb0186384b10c424eb0b7063254ca7cdd
Parents: 44c800f
Author: Jeff Zhang <zj...@apache.org>
Authored: Mon Dec 19 15:12:04 2016 +0800
Committer: Lee moon soo <mo...@apache.org>
Committed: Mon Dec 19 10:40:57 2016 -0800
----------------------------------------------------------------------
bin/zeppelin.cmd | 5 -----
bin/zeppelin.sh | 5 -----
2 files changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ca7b28ad/bin/zeppelin.cmd
----------------------------------------------------------------------
diff --git a/bin/zeppelin.cmd b/bin/zeppelin.cmd
index 50c6c8e..682caf0 100644
--- a/bin/zeppelin.cmd
+++ b/bin/zeppelin.cmd
@@ -84,9 +84,4 @@ if not exist %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%"
-)
-
"%ZEPPELIN_RUNNER%" %JAVA_OPTS% -cp %CLASSPATH% %ZEPPELIN_SERVER% "%*"
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/ca7b28ad/bin/zeppelin.sh
----------------------------------------------------------------------
diff --git a/bin/zeppelin.sh b/bin/zeppelin.sh
index 61b1d75..94711d9 100755
--- a/bin/zeppelin.sh
+++ b/bin/zeppelin.sh
@@ -83,9 +83,4 @@ if [[ ! -d "${ZEPPELIN_PID_DIR}" ]]; then
$(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 "$@"