svn commit: r27099 - /dev/zeppelin/zeppelin-0.8.0-rc3/
Author: zjffdu Date: Fri May 25 06:57:36 2018 New Revision: 27099 Log: Upload Zeppelin 0.8.0 rc3 Added: dev/zeppelin/zeppelin-0.8.0-rc3/ dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz (with props) dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.asc dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.sha512 dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz (with props) dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.asc dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.sha512 dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0.tgz (with props) dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0.tgz.asc dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0.tgz.sha512 Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz == Binary file - no diff available. Propchange: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz -- svn:mime-type = application/octet-stream Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.asc == --- dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.asc (added) +++ dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.asc Fri May 25 06:57:36 2018 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJbB5JyAAoJEAkPvhTZsX0fBhgQAI9x8u+MwfF7e2bEHPK4LP9f +y2p+3yBgzsHxM3y9oxljbcR9ti296bp0xxKsbTIMktai/BIR1hIdsIEFpMkXzhue +egEryf7QIMCZY6GE+NUDqK8EUzPNXUAfTMnnJrMH8TVBX5siJtA84sjxzboDcfW2 +zJpiHXinlon1vdxEc92IeQog3Ano+7ZBHp4bpsJn0oLQkwDP//QugN3hGcmiocM7 +hbBnS9KsWEduIqZ5QqqnNCcB/GsTBfdJMScwn/i1jrGqQZ3Gvbpi6DfN7NA9q30q +gIWwHFFmGz+qem2HgHyrG4VayElRGalBbnoZkWpphM5ujzAH+V9BIq26ie8smNgZ +15zl9iiz02YOBR7otku+bOrAahcxXxi8MjpzeX+k1opEDO1oE9BOH0Noyu8Z6J7O +XCPeGBVcVbcCzmfUFVX6ayXUw1LSxQU7TfdTHnu/R7/EI+5G4ufrc422ln+uQ8nF +VKVQZbLJjEDm7z4mJ7pbOKRtvnjbTGh6gSmPbTHikPe/zZCEsNE8+IwD8IfZ4jr2 +N4Kw6i5fqNs8R/EQmC7Ki4sm7zoc0KXDTVSiAjF11Lbyflabh2wECo+r4KPl2/YG +Fk3lyxPTZ0tg7R9fMRNDFtppzh1qSOZDHiWElNqu93gTpFn4mu77WLR8UP3tEi3G +E64yOlUAAY/DWN0VlfUj +=Ta+I +-END PGP SIGNATURE- Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.sha512 == --- dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.sha512 (added) +++ dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.sha512 Fri May 25 06:57:36 2018 @@ -0,0 +1 @@ +f1012e5006281b83f36e445b733486d92140f22eebe6bcd371ff150e71fc042b6948d1abf206349b627f87a4b321ac6917be72e4f13928cee26722b343102673 zeppelin-0.8.0-bin-all.tgz Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz == Binary file - no diff available. Propchange: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz -- svn:mime-type = application/octet-stream Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.asc == --- dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.asc (added) +++ dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.asc Fri May 25 06:57:36 2018 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJbB5j3AAoJEAkPvhTZsX0fHRwP/iFpEiTpDfytSb7xJk1dpB11 +LQOUw03w+tW2We+/xDp6uRciHfxqcPNlxpvvNt/2hiGnPM1mOfcdDUzd4Rv6041X +RlIH2SBMQN+7z8Tm12gEVmNjJdLRuNZ72LoSwrRFEj6AazJfOTFzZvQhaZWPoQbp +2RBDVV2IFXxpT6wmGBkhD3hA7juZNrB55sIX0CyBvofGWhXP7v9kCq/8mkJzqrrS +hmZt2J6LdW60fdGgME2LDrppkZMl7gDKhR3lQXaJYn6lQaFoAsUNbDbkkksnsu2r +Cb/cfceDOL+bd0pD22H7ItSPi4WgaFFAYBr0y1c+L7Ar6+bg9/foEkp+ohxxaps4 +JE66ZlX1L59jYes852U42mM97y7O6zVXU4DV4NOm14RjjOD/oorjRAV7bUDvCN3q +jTPuqmb9JQvd0CUEQ++RVZFope32dP4XcM6LG7lO0b6N6npt7ImzKBxe2DlZuZf2 +qpxnxlDr6O2zcFFyiPcPnOvxOh0w9clK72jv/tcJkX1/cOcWt6UmYrGvGsRdnWsA +qGVcSY2+ud6HYO1F9bwcR+JHA9mrToFKAt6ERMljVXyr1gx/xgA6k3Q6boP9p2hG +e0Cy0wlFVC5rbKWHXzlO92DprOTqh8ncs8YtwdUeHS2kpKviX6XI7sWk+B6W/8y3 +y0iICGXvEIugFW8YlwgC +=yUg7 +-END PGP SIGNATURE- Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.sha512 == --- dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.sha512 (added) +++ dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.sha512 Fri May 25 06:57:36 2018 @@ -0,0 +1 @@ +0ddb507b4c51126240b183a9b3e62182961c232e7414b7189218cce6c783c23d0ca9b9966ac52216b34c421902157321382fe6e27a7e71b5738c1b0e5f345b01 zeppelin-0.8.0-bin-netinst.tgz Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0.tgz ==
svn commit: r27098 - /dev/zeppelin/zeppelin-0.8.0-rc3/
Author: zjffdu Date: Fri May 25 06:27:43 2018 New Revision: 27098 Log: Delete Zeppelin 0.8.0 rc3 Removed: dev/zeppelin/zeppelin-0.8.0-rc3/
[1/2] zeppelin git commit: Preparing Apache Zeppelin release 0.8.0
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 f0ecb -> 664e2880e Preparing Apache Zeppelin release 0.8.0 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/1d930368 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/1d930368 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/1d930368 Branch: refs/heads/branch-0.8 Commit: 1d930368e781acaedf68501da47b81ddb9a8b9b7 Parents: f0e Author: Jeff Zhang Authored: Fri May 25 12:14:32 2018 +0800 Committer: Jeff Zhang Committed: Fri May 25 12:14:32 2018 +0800 -- alluxio/pom.xml | 4 ++-- angular/pom.xml | 4 ++-- beam/pom.xml| 4 ++-- bigquery/pom.xml| 4 ++-- cassandra/pom.xml | 4 ++-- elasticsearch/pom.xml | 4 ++-- file/pom.xml| 4 ++-- flink/pom.xml | 4 ++-- geode/pom.xml | 4 ++-- groovy/pom.xml | 4 ++-- hbase/pom.xml | 4 ++-- helium-dev/pom.xml | 4 ++-- ignite/pom.xml | 4 ++-- interpreter-parent/pom.xml | 4 ++-- jdbc/pom.xml| 4 ++-- kylin/pom.xml | 4 ++-- lens/pom.xml| 4 ++-- livy/pom.xml| 4 ++-- markdown/pom.xml| 4 ++-- neo4j/pom.xml | 4 ++-- pig/pom.xml | 4 ++-- pom.xml | 2 +- python/pom.xml | 4 ++-- r/pom.xml | 4 ++-- sap/pom.xml | 4 ++-- scalding/pom.xml| 4 ++-- scio/pom.xml| 4 ++-- shell/pom.xml | 4 ++-- spark/interpreter/pom.xml | 4 ++-- spark/pom.xml | 4 ++-- spark/scala-2.10/pom.xml| 4 ++-- spark/scala-2.11/pom.xml| 4 ++-- spark/spark-dependencies/pom.xml| 4 ++-- spark/spark-scala-parent/pom.xml| 4 ++-- spark/spark-shims/pom.xml | 4 ++-- spark/spark1-shims/pom.xml | 4 ++-- spark/spark2-shims/pom.xml | 4 ++-- zeppelin-display/pom.xml| 4 ++-- zeppelin-distribution/pom.xml | 2 +- zeppelin-examples/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-clock/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-horizontalbar/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-spell-echo/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-markdown/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-translator/pom.xml | 4 ++-- zeppelin-integration/pom.xml| 4 ++-- zeppelin-interpreter/pom.xml| 4 ++-- zeppelin-jupyter/pom.xml| 4 ++-- zeppelin-server/pom.xml | 4 ++-- zeppelin-web/pom.xml| 4 ++-- zeppelin-zengine/pom.xml| 4 ++-- 52 files changed, 102 insertions(+), 102 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1d930368/alluxio/pom.xml -- diff --git a/alluxio/pom.xml b/alluxio/pom.xml index acef494..b6a4876 100644 --- a/alluxio/pom.xml +++ b/alluxio/pom.xml @@ -22,14 +22,14 @@ interpreter-parent org.apache.zeppelin -0.8.1-SNAPSHOT +0.8.0 ../interpreter-parent org.apache.zeppelin zeppelin-alluxio jar -0.8.1-SNAPSHOT +0.8.0 Zeppelin: Alluxio
[zeppelin] Git Push Summary
Repository: zeppelin Updated Tags: refs/tags/v0.8.0-rc3 [created] 1d930368e
[2/2] zeppelin git commit: Preparing development version 0.8.1-SNAPSHOT
Preparing development version 0.8.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/664e2880 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/664e2880 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/664e2880 Branch: refs/heads/branch-0.8 Commit: 664e2880ec9cc619fe727480322ee6ff7354022e Parents: 1d93036 Author: Jeff Zhang Authored: Fri May 25 12:14:42 2018 +0800 Committer: Jeff Zhang Committed: Fri May 25 12:14:42 2018 +0800 -- alluxio/pom.xml | 4 ++-- angular/pom.xml | 4 ++-- beam/pom.xml| 4 ++-- bigquery/pom.xml| 4 ++-- cassandra/pom.xml | 4 ++-- elasticsearch/pom.xml | 4 ++-- file/pom.xml| 4 ++-- flink/pom.xml | 4 ++-- geode/pom.xml | 4 ++-- groovy/pom.xml | 4 ++-- hbase/pom.xml | 4 ++-- helium-dev/pom.xml | 4 ++-- ignite/pom.xml | 4 ++-- interpreter-parent/pom.xml | 4 ++-- jdbc/pom.xml| 4 ++-- kylin/pom.xml | 4 ++-- lens/pom.xml| 4 ++-- livy/pom.xml| 4 ++-- markdown/pom.xml| 4 ++-- neo4j/pom.xml | 4 ++-- pig/pom.xml | 4 ++-- pom.xml | 2 +- python/pom.xml | 4 ++-- r/pom.xml | 4 ++-- sap/pom.xml | 4 ++-- scalding/pom.xml| 4 ++-- scio/pom.xml| 4 ++-- shell/pom.xml | 4 ++-- spark/interpreter/pom.xml | 4 ++-- spark/pom.xml | 4 ++-- spark/scala-2.10/pom.xml| 4 ++-- spark/scala-2.11/pom.xml| 4 ++-- spark/spark-dependencies/pom.xml| 4 ++-- spark/spark-scala-parent/pom.xml| 4 ++-- spark/spark-shims/pom.xml | 4 ++-- spark/spark1-shims/pom.xml | 4 ++-- spark/spark2-shims/pom.xml | 4 ++-- zeppelin-display/pom.xml| 4 ++-- zeppelin-distribution/pom.xml | 2 +- zeppelin-examples/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-clock/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-horizontalbar/pom.xml| 4 ++-- zeppelin-examples/zeppelin-example-spell-echo/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-markdown/pom.xml | 4 ++-- zeppelin-examples/zeppelin-example-spell-translator/pom.xml | 4 ++-- zeppelin-integration/pom.xml| 4 ++-- zeppelin-interpreter/pom.xml| 4 ++-- zeppelin-jupyter/pom.xml| 4 ++-- zeppelin-server/pom.xml | 4 ++-- zeppelin-web/pom.xml| 4 ++-- zeppelin-zengine/pom.xml| 4 ++-- 52 files changed, 102 insertions(+), 102 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/664e2880/alluxio/pom.xml -- diff --git a/alluxio/pom.xml b/alluxio/pom.xml index b6a4876..acef494 100644 --- a/alluxio/pom.xml +++ b/alluxio/pom.xml @@ -22,14 +22,14 @@ interpreter-parent org.apache.zeppelin -0.8.0 +0.8.1-SNAPSHOT ../interpreter-parent org.apache.zeppelin zeppelin-alluxio jar -0.8.0 +0.8.1-SNAPSHOT Zeppelin: Alluxio interpreter http://git-wip-us.apache.org/repos/asf/zeppelin/blob/664e2880
[zeppelin] Git Push Summary
Repository: zeppelin Updated Tags: refs/tags/v0.8.0-rc3 [deleted] 3fbbe326f
zeppelin git commit: ZEPPELIN-3497. Improve error message when livy session is failed to create
Repository: zeppelin
Updated Branches:
refs/heads/master 3b041f469 -> a6075017d
ZEPPELIN-3497. Improve error message when livy session is failed to create
### What is this PR for?
The current behavior we will only return 10 lines of log to frontend which is
not enough for user. This PR would invoke another livy api to get more logs (by
default it is 1000 lines)
### What type of PR is it?
[Improvement ]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3497
### How should this be tested?
* Manually tested
### Screenshots (if appropriate)
Before
After
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Jeff Zhang
Closes #2984 from zjffdu/ZEPPELIN-3497 and squashes the following commits:
2d108 [Jeff Zhang] ZEPPELIN-3497. Improve error message when livy session
is failed to create
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a6075017
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a6075017
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a6075017
Branch: refs/heads/master
Commit: a6075017d5c8d1503c4cc392eef22bfb53db6258
Parents: 3b041f4
Author: Jeff Zhang
Authored: Thu May 24 16:10:47 2018 +0800
Committer: Jeff Zhang
Committed: Fri May 25 12:08:25 2018 +0800
--
.../zeppelin/livy/BaseLivyInterpreter.java | 26 ++--
.../src/main/resources/interpreter-setting.json | 6 +
2 files changed, 30 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a6075017/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 9d2c0cf..eef5f5c 100644
--- a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
+++ b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
@@ -94,6 +94,7 @@ public abstract class BaseLivyInterpreter extends Interpreter
{
private String livyURL;
private int sessionCreationTimeout;
private int pullStatusInterval;
+ private int maxLogLines;
protected boolean displayAppInfo;
private boolean restartDeadSession;
protected LivyVersion livyVersion;
@@ -119,6 +120,8 @@ public abstract class BaseLivyInterpreter extends
Interpreter {
property.getProperty("zeppelin.livy.session.create_timeout", 120 +
""));
this.pullStatusInterval = Integer.parseInt(
property.getProperty("zeppelin.livy.pull_status.interval.millis", 1000
+ ""));
+this.maxLogLines =
Integer.parseInt(property.getProperty("zeppelin.livy.maxLogLines",
+"1000"));
this.restTemplate = createRestTemplate();
if
(!StringUtils.isBlank(property.getProperty("zeppelin.livy.http.headers"))) {
String[] headers =
property.getProperty("zeppelin.livy.http.headers").split(";");
@@ -338,7 +341,7 @@ public abstract class BaseLivyInterpreter extends
Interpreter {
if ((System.currentTimeMillis() - start) / 1000 >
sessionCreationTimeout) {
String msg = "The creation of session " + sessionInfo.id + " is
timeout within "
+ sessionCreationTimeout + " seconds, appId: " +
sessionInfo.appId
- + ", log: " + sessionInfo.log;
+ + ", log:\n" +
StringUtils.join(getSessionLog(sessionInfo.id).log, "\n");
throw new LivyException(msg);
}
Thread.sleep(pullStatusInterval);
@@ -347,7 +350,7 @@ public abstract class BaseLivyInterpreter extends
Interpreter {
sessionInfo.appId);
if (sessionInfo.isFinished()) {
String msg = "Session " + sessionInfo.id + " is finished, appId: " +
sessionInfo.appId
- + ", log: " + sessionInfo.log;
+ + ", log:\n" +
StringUtils.join(getSessionLog(sessionInfo.id).log, "\n");
throw new LivyException(msg);
}
}
@@ -362,6 +365,11 @@ public abstract class BaseLivyInterpreter extends
Interpreter {
return SessionInfo.fromJson(callRestAPI("/sessions/" + sessionId, "GET"));
}
+ private SessionLog getSessionLog(int sessionId) throws LivyException {
+return SessionLog.fromJson(callRestAPI("/sessions/" + sessionId +
"/log?size=" + maxLogLines,
+"GET"));
+ }
+
public InterpreterResul
zeppelin git commit: ZEPPELIN-3497. Improve error message when livy session is failed to create
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.8 23ee74ce0 -> f0ecb
ZEPPELIN-3497. Improve error message when livy session is failed to create
### What is this PR for?
The current behavior we will only return 10 lines of log to frontend which is
not enough for user. This PR would invoke another livy api to get more logs (by
default it is 1000 lines)
### What type of PR is it?
[Improvement ]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3497
### How should this be tested?
* Manually tested
### Screenshots (if appropriate)
Before
After
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Jeff Zhang
Closes #2984 from zjffdu/ZEPPELIN-3497 and squashes the following commits:
2d108 [Jeff Zhang] ZEPPELIN-3497. Improve error message when livy session
is failed to create
(cherry picked from commit a6075017d5c8d1503c4cc392eef22bfb53db6258)
Signed-off-by: Jeff Zhang
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f0ec
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f0ec
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f0ec
Branch: refs/heads/branch-0.8
Commit: f0ecb60455f55f28068a6db3f886adae8c71
Parents: 23ee74c
Author: Jeff Zhang
Authored: Thu May 24 16:10:47 2018 +0800
Committer: Jeff Zhang
Committed: Fri May 25 12:08:41 2018 +0800
--
.../zeppelin/livy/BaseLivyInterpreter.java | 26 ++--
.../src/main/resources/interpreter-setting.json | 6 +
2 files changed, 30 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f0ec/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 858145c..079a427 100644
--- a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
+++ b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
@@ -95,6 +95,7 @@ public abstract class BaseLivyInterpreter extends Interpreter
{
private String livyURL;
private int sessionCreationTimeout;
private int pullStatusInterval;
+ private int maxLogLines;
protected boolean displayAppInfo;
private boolean restartDeadSession;
protected LivyVersion livyVersion;
@@ -120,6 +121,8 @@ public abstract class BaseLivyInterpreter extends
Interpreter {
property.getProperty("zeppelin.livy.session.create_timeout", 120 +
""));
this.pullStatusInterval = Integer.parseInt(
property.getProperty("zeppelin.livy.pull_status.interval.millis", 1000
+ ""));
+this.maxLogLines =
Integer.parseInt(property.getProperty("zeppelin.livy.maxLogLines",
+"1000"));
this.restTemplate = createRestTemplate();
if
(!StringUtils.isBlank(property.getProperty("zeppelin.livy.http.headers"))) {
String[] headers =
property.getProperty("zeppelin.livy.http.headers").split(";");
@@ -338,7 +341,7 @@ public abstract class BaseLivyInterpreter extends
Interpreter {
if ((System.currentTimeMillis() - start) / 1000 >
sessionCreationTimeout) {
String msg = "The creation of session " + sessionInfo.id + " is
timeout within "
+ sessionCreationTimeout + " seconds, appId: " +
sessionInfo.appId
- + ", log: " + sessionInfo.log;
+ + ", log:\n" +
StringUtils.join(getSessionLog(sessionInfo.id).log, "\n");
throw new LivyException(msg);
}
Thread.sleep(pullStatusInterval);
@@ -347,7 +350,7 @@ public abstract class BaseLivyInterpreter extends
Interpreter {
sessionInfo.appId);
if (sessionInfo.isFinished()) {
String msg = "Session " + sessionInfo.id + " is finished, appId: " +
sessionInfo.appId
- + ", log: " + sessionInfo.log;
+ + ", log:\n" +
StringUtils.join(getSessionLog(sessionInfo.id).log, "\n");
throw new LivyException(msg);
}
}
@@ -362,6 +365,11 @@ public abstract class BaseLivyInterpreter extends
Interpreter {
return SessionInfo.fromJson(callRestAPI("/sessions/" + sessionId, "GET"));
}
+ private SessionLog getSessionLog(int sessionId) throws LivyException {
+return SessionLog.fromJson(callRestAPI("/
zeppelin git commit: ZEPPELIN-3484. sc.setJobGroup() shows up in error stack and shifts line numbering
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.8 1e023b900 -> 23ee74ce0
ZEPPELIN-3484. sc.setJobGroup() shows up in error stack and shifts line
numbering
This PR would call sc.setJobGroup and the user code separately.
[Bug Fix]
* [ ] - Task
* https://issues.apache.org/jira/browse/ZEPPELIN-3483
* CI pass
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Jeff Zhang
Closes #2979 from zjffdu/ZEPPELIN-3484 and squashes the following commits:
774db4c00 [Jeff Zhang] ZEPPELIN-3484. sc.setJobGroup() shows up in error stack
and shifts line numbering
(cherry picked from commit 3b041f46962ad8f3393f38946bd304b485c87c2a)
Signed-off-by: Jeff Zhang
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/23ee74ce
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/23ee74ce
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/23ee74ce
Branch: refs/heads/branch-0.8
Commit: 23ee74ce052e073b6f141e9b7ea2830dce0db775
Parents: 1e023b9
Author: Jeff Zhang
Authored: Wed May 23 08:53:55 2018 +0800
Committer: Jeff Zhang
Committed: Thu May 24 16:37:07 2018 +0800
--
.../java/org/apache/zeppelin/spark/IPySparkInterpreter.java| 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/23ee74ce/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
--
diff --git
a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
index da7e7e2..35c5729 100644
---
a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
+++
b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
@@ -106,7 +106,11 @@ public class IPySparkInterpreter extends
IPythonInterpreter {
String jobGroupId = Utils.buildJobGroupId(context);
String jobDesc = "Started by: " +
Utils.getUserName(context.getAuthenticationInfo());
String setJobGroupStmt = "sc.setJobGroup('" + jobGroupId + "', '" +
jobDesc + "')";
-return super.interpret(setJobGroupStmt + "\n" + st, context);
+InterpreterResult result = super.interpret(setJobGroupStmt, context);
+if (result.code().equals(InterpreterResult.Code.ERROR)) {
+ return new InterpreterResult(InterpreterResult.Code.ERROR, "Fail to
setJobGroup");
+}
+return super.interpret(st, context);
}
@Override
[zeppelin] Git Push Summary [forced push!] [Forced Update!]
Repository: zeppelin Updated Branches: refs/heads/branch-0.8 d1a5ce8bb -> 1e023b900 (forced update)
zeppelin git commit: ZEPPELIN-3484. sc.setJobGroup() shows up in error stack and shifts line numbering
Repository: zeppelin
Updated Branches:
refs/heads/master c5c1b7734 -> 3b041f469
ZEPPELIN-3484. sc.setJobGroup() shows up in error stack and shifts line
numbering
### What is this PR for?
This PR would call sc.setJobGroup and the user code separately.
### What type of PR is it?
[Bug Fix]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3483
### How should this be tested?
* CI pass
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Jeff Zhang
Closes #2979 from zjffdu/ZEPPELIN-3484 and squashes the following commits:
774db4c00 [Jeff Zhang] ZEPPELIN-3484. sc.setJobGroup() shows up in error stack
and shifts line numbering
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/3b041f46
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/3b041f46
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/3b041f46
Branch: refs/heads/master
Commit: 3b041f46962ad8f3393f38946bd304b485c87c2a
Parents: c5c1b77
Author: Jeff Zhang
Authored: Wed May 23 08:53:55 2018 +0800
Committer: Jeff Zhang
Committed: Thu May 24 16:30:49 2018 +0800
--
.../java/org/apache/zeppelin/spark/IPySparkInterpreter.java| 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3b041f46/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
--
diff --git
a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
index 3896cba..f4c552e 100644
---
a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
+++
b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/IPySparkInterpreter.java
@@ -117,7 +117,11 @@ public class IPySparkInterpreter extends
IPythonInterpreter {
String jobGroupId = Utils.buildJobGroupId(context);
String jobDesc = "Started by: " +
Utils.getUserName(context.getAuthenticationInfo());
String setJobGroupStmt = "sc.setJobGroup('" + jobGroupId + "', '" +
jobDesc + "')";
-return super.interpret(setJobGroupStmt +"\n" + st, context);
+InterpreterResult result = super.interpret(setJobGroupStmt, context);
+if (result.code().equals(InterpreterResult.Code.ERROR)) {
+ return new InterpreterResult(InterpreterResult.Code.ERROR, "Fail to
setJobGroup");
+}
+return super.interpret(st, context);
}
@Override
svn commit: r27078 - /dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz
Author: zjffdu Date: Thu May 24 07:38:39 2018 New Revision: 27078 Log: Upload Zeppelin 0.8.0 rc3 Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz (with props) Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz == Binary file - no diff available. Propchange: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz -- svn:mime-type = application/octet-stream
svn commit: r27077 - /dev/zeppelin/zeppelin-0.8.0-rc3/
Author: zjffdu Date: Thu May 24 07:31:22 2018 New Revision: 27077 Log: Upload Zeppelin 0.8.0 rc3 Added: dev/zeppelin/zeppelin-0.8.0-rc3/ dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.asc dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.md5 dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.sha512 dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.asc dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.md5 dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.sha512 dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0.tgz (with props) dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0.tgz.asc dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0.tgz.md5 dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0.tgz.sha512 Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.asc == --- dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.asc (added) +++ dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.asc Thu May 24 07:31:22 2018 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJbBXewAAoJEAkPvhTZsX0f9B4P/R1pFKjfu9g8iQ0MfHlsG36E +NWXUOuhhcBRfeVpbuSiGEH8/F8MYgSGlN9mMu0EN+FR2Mj7fOTCg4WubpXmpDkp4 +U0jgCKX9yxuBDHsJGuy53eTjHoLvSSYPPF2WN542grHIxdt+YuFFlhkAKzZPqQk6 +/zgxJcBzvkCEriLYfeRZ3nnIAOk3AofDTHJmIw5LP/1gBMm3ICAUeeYwrT6tqhZ2 +tJ7zSe0tqc6xtL70mEfRFuCyrsyss6CtqZ9ymjhp4+P1r4z700jw/shlKOEZAP0T +0NsH24ehdCJXIkR+v0jyZeqw1baB8e/LX/YwBsvOCFi9hPKIGNiF0H67ewozF6oz +eFDhPE+mQX3/CwVKrotSBw7dCMg0siupxCVrthYAnbxt9JspI5B3TGLe5ntDtYei +nApDaN8aYcerhM1BisaN6KkiPr8kVeLdATTtbF+kG89AD5qPpvYeZ3+DNtzvNoQk +lci3kMrH5UL+FsloHV5g/zCJtWLPvnpsIQL9ZrRne9JXa+ZyuSHW5/Yjq2D/sH8b +ANtjwMypu2VE9liO1DJplgu3juKo8lnotxMClKALzwORNsG2KdHoFmVDe8OUow6a ++1zCDVFlxHR75iOYWqWUO3V4F8r8Ck9Gzh82H70hy34iykygP2X+uaFLFURU8tmS +wlV79ULQuGXQMW18vQtd +=YiZR +-END PGP SIGNATURE- Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.md5 == --- dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.md5 (added) +++ dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.md5 Thu May 24 07:31:22 2018 @@ -0,0 +1 @@ +zeppelin-0.8.0-bin-all.tgz: DB 7E 9E 70 94 30 62 74 34 42 F0 A1 DF F7 33 77 Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.sha512 == --- dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.sha512 (added) +++ dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-all.tgz.sha512 Thu May 24 07:31:22 2018 @@ -0,0 +1 @@ +9f9837a6359b5faf340d89883f9cefce0e0a54428681e498e40a14ab2b2091ff5f028718db9bb2c30aff9a8f45590dcdd3906f3a816f2bd453a64c89e3203342 zeppelin-0.8.0-bin-all.tgz Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.asc == --- dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.asc (added) +++ dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.asc Thu May 24 07:31:22 2018 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v2 + +iQIcBAABCAAGBQJbBkLVAAoJEAkPvhTZsX0fmiIQAJ2dskizPzqEEB/sTghfbbWR +KK4E8gEjrbc5TFy+U/6PmReGeRb18GO+d2rFoL59jYFcG5Dt7gruH08rRcxnYcrb +ALXe2FcLBnFsuDBs4njyciSwO4ClsMbh+2/9peyG5S8pyl9GXp6ru0HHutVzsQqH +eIdfJ16/hLmDB44Uz/T75wrFKeMdvM6RnAFN6iIS79394l3e6tWkVN+uR2JkVBhB +/vJinpv1oxC7DW3daW5e8UyAmC4QLi6bTe2/vHMPcZWdASXqIQHJFxxLnh5h0URx +OwWnclBNxDmxmn9hubpljGwYE/bUDDxO0hdlUtgXWyMg7V7UR3I65+GMzcrol1w0 +T5JKtDANiHeuRcWECjcWTYbCKJItf46Hn6lI0fLFWWtyeWyPff6hg/ThqP14LI/r +JWqaOf+wlLV6tyPVk9qe3lIYWi+G9WLHS9ARic6FRrLB0yH9MrQljkeilFn4HvNy +uvuP0dgEUTkm+rpLB3gZWU5+mA8uKowQfpOBiZs9dPCzDMYhLQeNToGr/77UClBs +nqHOQkP0v7+17L3mLYfDK7YW1QJKYUn4hfskmf8vx4NWwFnXsxynKiz4l/NT68F0 +aDVYBSVNpiOpX+R+tsKqMOLjZgQdZBcAzL26ELovlCgoAfy8fxmsQvIzFm3HgJA7 +kyRBme97+Z/DjkF7TIM1 +=ethi +-END PGP SIGNATURE- Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.md5 == --- dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.md5 (added) +++ dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.md5 Thu May 24 07:31:22 2018 @@ -0,0 +1 @@ +zeppelin-0.8.0-bin-netinst.tgz: 9E 7B 9B 76 18 66 EC FF 8E 50 7E 54 B4 B8 70 BF Added: dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.sha512 == --- dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.sha512 (added) +++ dev/zeppelin/zeppelin-0.8.0-rc3/zeppelin-0.8.0-bin-netinst.tgz.sha512 Thu May 24 07:31:22 2018 @@ -0,0 +1 @@ +c5309121f414f2929a5cdd8d3710ff4469bb8aa9e38b5e8c55de1ff54c7fdcd134a1cc5c005a206a6cf287c021fb1c021ee15834a93d9b5e14e4fcd70f451fdd zeppelin-
zeppelin git commit: [ZEPPELIN-3491][Minor] Add apple-touch-icon.png to Zeppelin project
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.8 4a05c7873 -> d1a5ce8bb
[ZEPPELIN-3491][Minor] Add apple-touch-icon.png to Zeppelin project
This JIRA is to add apple-touch-icon.png to Zeppelin project
[Minor]
* [ZEPPELIN-3491](https://issues.apache.org/jira/browse/ZEPPELIN-3491)
* Does the licenses files need update? N/A
* Is there breaking changes for older versions? N/A
* Does this needs documentation? N/A
Author: Prabhjyot Singh
Closes #2981 from prabhjyotsingh/ZEPPELIN-3491 and squashes the following
commits:
d55a73fea [Prabhjyot Singh] [ZEPPELIN-3491] Add apple-touch-icon.png to
Zeppelin project
Change-Id: I16f8aa1cdcc0f33fcc0f728a55155ac2b1b401f6
(cherry picked from commit c5c1b77344ac6653b3075ff4da14a7a160c57d90)
Signed-off-by: Prabhjyot Singh
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/d1a5ce8b
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/d1a5ce8b
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/d1a5ce8b
Branch: refs/heads/branch-0.8
Commit: d1a5ce8bbd260ae681f90115949f6493bbd238cd
Parents: 4a05c78
Author: Prabhjyot Singh
Authored: Wed May 23 13:10:15 2018 +0530
Committer: Prabhjyot Singh
Committed: Thu May 24 12:30:05 2018 +0530
--
zeppelin-web/src/apple-touch-icon.png | Bin 0 -> 2699 bytes
zeppelin-web/src/index.html | 3 ++-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d1a5ce8b/zeppelin-web/src/apple-touch-icon.png
--
diff --git a/zeppelin-web/src/apple-touch-icon.png
b/zeppelin-web/src/apple-touch-icon.png
new file mode 100644
index 000..4bfd6de
Binary files /dev/null and b/zeppelin-web/src/apple-touch-icon.png differ
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d1a5ce8b/zeppelin-web/src/index.html
--
diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
index 6e9cabb..ee707c1 100644
--- a/zeppelin-web/src/index.html
+++ b/zeppelin-web/src/index.html
@@ -33,7 +33,8 @@ limitations under the License.
div.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {
z-index: -1 !important; }
-
+
+
zeppelin git commit: [ZEPPELIN-3491][Minor] Add apple-touch-icon.png to Zeppelin project
Repository: zeppelin
Updated Branches:
refs/heads/master 965f71e85 -> c5c1b7734
[ZEPPELIN-3491][Minor] Add apple-touch-icon.png to Zeppelin project
This JIRA is to add apple-touch-icon.png to Zeppelin project
[Minor]
* [ZEPPELIN-3491](https://issues.apache.org/jira/browse/ZEPPELIN-3491)
* Does the licenses files need update? N/A
* Is there breaking changes for older versions? N/A
* Does this needs documentation? N/A
Author: Prabhjyot Singh
Closes #2981 from prabhjyotsingh/ZEPPELIN-3491 and squashes the following
commits:
d55a73fea [Prabhjyot Singh] [ZEPPELIN-3491] Add apple-touch-icon.png to
Zeppelin project
Change-Id: I16f8aa1cdcc0f33fcc0f728a55155ac2b1b401f6
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c5c1b773
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c5c1b773
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c5c1b773
Branch: refs/heads/master
Commit: c5c1b77344ac6653b3075ff4da14a7a160c57d90
Parents: 965f71e
Author: Prabhjyot Singh
Authored: Wed May 23 13:10:15 2018 +0530
Committer: Prabhjyot Singh
Committed: Thu May 24 12:29:37 2018 +0530
--
zeppelin-web/src/apple-touch-icon.png | Bin 0 -> 2699 bytes
zeppelin-web/src/index.html | 3 ++-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c5c1b773/zeppelin-web/src/apple-touch-icon.png
--
diff --git a/zeppelin-web/src/apple-touch-icon.png
b/zeppelin-web/src/apple-touch-icon.png
new file mode 100644
index 000..4bfd6de
Binary files /dev/null and b/zeppelin-web/src/apple-touch-icon.png differ
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c5c1b773/zeppelin-web/src/index.html
--
diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
index 6e9cabb..ee707c1 100644
--- a/zeppelin-web/src/index.html
+++ b/zeppelin-web/src/index.html
@@ -33,7 +33,8 @@ limitations under the License.
div.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {
z-index: -1 !important; }
-
+
+
