Repository: zeppelin Updated Branches: refs/heads/branch-0.7 3355b8f25 -> 5636f9355
[ZEPPELIN-2716] Change the default value of zeppelin.livy.displayAppInfo to true Since it is quite useful to expose the application info for user to monitor and debug, so here propose to enable "zeppelin.livy.displayAppInfo" to true as default. Improvement https://issues.apache.org/jira/browse/ZEPPELIN-2716 Manual verification. Author: jerryshao <ss...@hortonworks.com> Closes #2459 from jerryshao/ZEPPELIN-2716 and squashes the following commits: c9506ab [jerryshao] Address UT failure 32d3f72 [jerryshao] Change the default value of zeppelin.livy.displayAppInfo to true (cherry picked from commit 985b86e4d2754d3c73422e5c722c8a5e62bc1b40) Signed-off-by: Jeff Zhang <zjf...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/5636f935 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/5636f935 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/5636f935 Branch: refs/heads/branch-0.7 Commit: 5636f9355a80bdf10e5fb564b9db71dd06059039 Parents: 3355b8f Author: jerryshao <ss...@hortonworks.com> Authored: Wed Jul 5 22:27:02 2017 +0800 Committer: Jeff Zhang <zjf...@apache.org> Committed: Tue Jul 11 16:42:34 2017 +0800 ---------------------------------------------------------------------- docs/interpreter/livy.md | 16 ++++++++++------ .../apache/zeppelin/livy/BaseLivyInterpreter.java | 2 +- livy/src/main/resources/interpreter-setting.json | 9 +++++---- .../org/apache/zeppelin/livy/LivyInterpreterIT.java | 1 + 4 files changed, 17 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5636f935/docs/interpreter/livy.md ---------------------------------------------------------------------- diff --git a/docs/interpreter/livy.md b/docs/interpreter/livy.md index ce1c34a..132f327 100644 --- a/docs/interpreter/livy.md +++ b/docs/interpreter/livy.md @@ -43,7 +43,7 @@ We added some common configurations for spark, and you can set any configuration You can find all Spark configurations in [here](http://spark.apache.org/docs/latest/configuration.html#available-properties). And instead of starting property with `spark.` it should be replaced with `livy.spark.`. Example: `spark.driver.memory` to `livy.spark.driver.memory` - + <table class="table-configuration"> <tr> <th>Property</th> @@ -67,7 +67,7 @@ Example: `spark.driver.memory` to `livy.spark.driver.memory` </tr> <tr> <td>zeppelin.livy.displayAppInfo</td> - <td>false</td> + <td>true</td> <td>Whether to display app info</td> </tr> <tr> @@ -145,7 +145,7 @@ Example: `spark.driver.memory` to `livy.spark.driver.memory` **We remove livy.spark.master in zeppelin-0.7. Because we sugguest user to use livy 0.3 in zeppelin-0.7. And livy 0.3 don't allow to specify livy.spark.master, it enfornce yarn-cluster mode.** ## Adding External libraries -You can load dynamic library to livy interpreter by set `livy.spark.jars.packages` property to comma-separated list of maven coordinates of jars to include on the driver and executor classpaths. The format for the coordinates should be groupId:artifactId:version. +You can load dynamic library to livy interpreter by set `livy.spark.jars.packages` property to comma-separated list of maven coordinates of jars to include on the driver and executor classpaths. The format for the coordinates should be groupId:artifactId:version. Example @@ -161,7 +161,7 @@ Example <td>Adding extra libraries to livy interpreter</td> </tr> </table> - + ## How to use Basically, you can use @@ -192,7 +192,11 @@ hello("livy") ``` ## Impersonation -When Zeppelin server is running with authentication enabled, then this interpreter utilizes Livyâs user impersonation feature i.e. sends extra parameter for creating and running a session ("proxyUser": "${loggedInUser}"). This is particularly useful when multi users are sharing a Notebook server. + +When Zeppelin server is running with authentication enabled, +then this interpreter utilizes Livyâs user impersonation feature +i.e. sends extra parameter for creating and running a session ("proxyUser": "${loggedInUser}"). +This is particularly useful when multi users are sharing a Notebook server. ## Apply Zeppelin Dynamic Forms @@ -221,4 +225,4 @@ The session would have timed out, you may need to restart the interpreter. Edit `conf/spark-blacklist.conf` file in livy server and comment out `#spark.master` line. If you choose to work on livy in `apps/spark/java` directory in [https://github.com/cloudera/hue](https://github.com/cloudera/hue), -copy `spark-user-configurable-options.template` to `spark-user-configurable-options.conf` file in livy server and comment out `#spark.master`. +copy `spark-user-configurable-options.template` to `spark-user-configurable-options.conf` file in livy server and comment out `#spark.master`. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5636f935/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java ---------------------------------------------------------------------- diff --git a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java index 1322a4d..022aef8 100644 --- a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java +++ b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java @@ -85,7 +85,7 @@ public abstract class BaseLivyInterpreter extends Interpreter { super(property); this.livyURL = property.getProperty("zeppelin.livy.url"); this.displayAppInfo = Boolean.parseBoolean( - property.getProperty("zeppelin.livy.displayAppInfo", "false")); + property.getProperty("zeppelin.livy.displayAppInfo", "true")); this.sessionCreationTimeout = Integer.parseInt( property.getProperty("zeppelin.livy.session.create_timeout", 120 + "")); this.pullStatusInterval = Integer.parseInt( http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5636f935/livy/src/main/resources/interpreter-setting.json ---------------------------------------------------------------------- diff --git a/livy/src/main/resources/interpreter-setting.json b/livy/src/main/resources/interpreter-setting.json index 42f64cf..51c9829 100644 --- a/livy/src/main/resources/interpreter-setting.json +++ b/livy/src/main/resources/interpreter-setting.json @@ -89,8 +89,9 @@ }, "zeppelin.livy.displayAppInfo": { "propertyName": "zeppelin.livy.displayAppInfo", - "defaultValue": "false", - "description": "Whether display app info" + "defaultValue": "true", + "description": "Whether display app info", + "type": "checkbox" } }, "option": { @@ -163,7 +164,7 @@ "name": "pyspark3", "className": "org.apache.zeppelin.livy.LivyPySpark3Interpreter", "properties": { - }, + }, "option": { "remote": true, "port": -1, @@ -177,7 +178,7 @@ "language": "python", "editOnDblClick": false } - }, + }, { "group": "livy", "name": "sparkr", http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5636f935/livy/src/test/java/org/apache/zeppelin/livy/LivyInterpreterIT.java ---------------------------------------------------------------------- diff --git a/livy/src/test/java/org/apache/zeppelin/livy/LivyInterpreterIT.java b/livy/src/test/java/org/apache/zeppelin/livy/LivyInterpreterIT.java index 94213f5..302f002 100644 --- a/livy/src/test/java/org/apache/zeppelin/livy/LivyInterpreterIT.java +++ b/livy/src/test/java/org/apache/zeppelin/livy/LivyInterpreterIT.java @@ -53,6 +53,7 @@ public class LivyInterpreterIT { properties.setProperty("zeppelin.livy.url", cluster.livyEndpoint()); properties.setProperty("zeppelin.livy.session.create_timeout", "120"); properties.setProperty("zeppelin.livy.spark.sql.maxResult", "100"); + properties.setProperty("zeppelin.livy.displayAppInfo", "false"); } @AfterClass
