Repository: incubator-zeppelin Updated Branches: refs/heads/master 4538524e9 -> b5506f76f
ZEPPELIN-358: Jetty server is HTTP ERROR 404 [ZEPPELIN-358](https://issues.apache.org/jira/browse/ZEPPELIN-358) Define local jetty temp directory. `varName: zeppelin.war.tempdir` `default varValue: webapps` Zeppelin create temp directory in `{zeppelin.home}/webapps` when zeppelin server start. Author: Minwoo Kang <[email protected]> Closes #498 from mwkang/master and squashes the following commits: f19e2ca [Minwoo Kang] ZEPPELIN-358 add the environment variable and property. update documentation. cc7fdb7 [Minwoo Kang] ZEPPELIN-358 restore unused imports 0046d36 [Minwoo Kang] ZEPPELIN-358 use getRelativeDir instead of getString 98b784c [Minwoo Kang] ZEPPELIN-358 add jetty temporary directory Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/b5506f76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/b5506f76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/b5506f76 Branch: refs/heads/master Commit: b5506f76f590e8e01be67dc16639cc8e9f35d7f9 Parents: 4538524 Author: Minwoo Kang <[email protected]> Authored: Wed Dec 2 11:38:57 2015 +0900 Committer: Alexander Bezzubov <[email protected]> Committed: Fri Dec 4 09:02:34 2015 +0900 ---------------------------------------------------------------------- conf/zeppelin-env.sh.template | 1 + conf/zeppelin-site.xml.template | 6 ++++++ docs/install/install.md | 8 +++++++- .../main/java/org/apache/zeppelin/server/ZeppelinServer.java | 4 ++++ .../java/org/apache/zeppelin/conf/ZeppelinConfiguration.java | 6 +++--- 5 files changed, 21 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/b5506f76/conf/zeppelin-env.sh.template ---------------------------------------------------------------------- diff --git a/conf/zeppelin-env.sh.template b/conf/zeppelin-env.sh.template index fe133ba..b0b1a5b 100644 --- a/conf/zeppelin-env.sh.template +++ b/conf/zeppelin-env.sh.template @@ -25,6 +25,7 @@ # export ZEPPELIN_LOG_DIR # Where log files are stored. PWD by default. # export ZEPPELIN_PID_DIR # The pid files are stored. /tmp by default. +# export ZEPPELIN_WAR_TEMPDIR # The location of jetty temporary directory. # export ZEPPELIN_NOTEBOOK_DIR # Where notebook saved # export ZEPPELIN_NOTEBOOK_HOMESCREEN # Id of notebook to be displayed in homescreen. ex) 2A94M5J1Z # export ZEPPELIN_NOTEBOOK_HOMESCREEN_HIDE # hide homescreen notebook from list when this value set to "true". default "false" http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/b5506f76/conf/zeppelin-site.xml.template ---------------------------------------------------------------------- diff --git a/conf/zeppelin-site.xml.template b/conf/zeppelin-site.xml.template index 0f44c62..191f8c2 100755 --- a/conf/zeppelin-site.xml.template +++ b/conf/zeppelin-site.xml.template @@ -38,6 +38,12 @@ </property> <property> + <name>zeppelin.war.tempdir</name> + <value>webapps</value> + <description>Location of jetty temporary directory</description> +</property> + +<property> <name>zeppelin.notebook.dir</name> <value>notebook</value> <description>path or URI for notebook persist</description> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/b5506f76/docs/install/install.md ---------------------------------------------------------------------- diff --git a/docs/install/install.md b/docs/install/install.md index d391401..73dd7e0 100644 --- a/docs/install/install.md +++ b/docs/install/install.md @@ -145,7 +145,13 @@ Configuration can be done by both environment variable(conf/zeppelin-env.sh) and <td>zeppelin.notebook.homescreen.hide</td> <td>false</td> <td>hide homescreen notebook from list when this value set to "true"</td> - </tr> + </tr> + <tr> + <td>ZEPPELIN_WAR_TEMPDIR</td> + <td>zeppelin.war.tempdir</td> + <td>webapps</td> + <td>The location of jetty temporary directory.</td> + </tr> <tr> <td>ZEPPELIN_NOTEBOOK_DIR</td> <td>zeppelin.notebook.dir</td> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/b5506f76/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java index ea8a0b6..4eb30bf 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java @@ -240,6 +240,10 @@ public class ZeppelinServer extends Application { } else { // use packaged WAR webApp.setWar(warPath.getAbsolutePath()); + File warTempDirectory = new File(conf.getRelativeDir(ConfVars.ZEPPELIN_WAR_TEMPDIR)); + warTempDirectory.mkdir(); + LOG.info("ZeppelinServer Webapp path: {}", warTempDirectory.getPath()); + webApp.setTempDirectory(warTempDirectory); } // Explicit bind to root webApp.addServlet( http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/b5506f76/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java index 1796430..909345a 100755 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java @@ -28,7 +28,6 @@ import org.apache.zeppelin.notebook.repo.VFSNotebookRepo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * Zeppelin configuration. * @@ -326,11 +325,11 @@ public class ZeppelinConfiguration extends XMLConfiguration { public String getNotebookDir() { return getString(ConfVars.ZEPPELIN_NOTEBOOK_DIR); } - + public String getUser() { return getString(ConfVars.ZEPPELIN_NOTEBOOK_S3_USER); } - + public String getBucketName() { return getString(ConfVars.ZEPPELIN_NOTEBOOK_S3_BUCKET); } @@ -398,6 +397,7 @@ public class ZeppelinConfiguration extends XMLConfiguration { ZEPPELIN_SSL_TRUSTSTORE_TYPE("zeppelin.ssl.truststore.type", null), ZEPPELIN_SSL_TRUSTSTORE_PASSWORD("zeppelin.ssl.truststore.password", null), ZEPPELIN_WAR("zeppelin.war", "../zeppelin-web/dist"), + ZEPPELIN_WAR_TEMPDIR("zeppelin.war.tempdir", "webapps"), ZEPPELIN_INTERPRETERS("zeppelin.interpreters", "org.apache.zeppelin.spark.SparkInterpreter," + "org.apache.zeppelin.spark.PySparkInterpreter," + "org.apache.zeppelin.spark.SparkSqlInterpreter,"
