Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[ZEPPELIN-2949] Allow custom Spark UI URL

Browse source
This commit is contained in:
Nelson Costa 2017-09-24 21:58:29 +01:00
parent e0fafac75c
commit 0a56299c55
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
View file

@ -206,7 +206,7 @@ public class SparkInterpreter extends Interpreter {
private String getJobUrl(int jobId) {
String jobUrl = null;
if (sparkUrl != null) {
jobUrl = sparkUrl + "/jobs/job?id=" + jobId;
jobUrl = sparkUrl + "/jobs/job/?id=" + jobId;
}
return jobUrl;
}
@ -936,6 +936,11 @@ public class SparkInterpreter extends Interpreter {
return sparkUrl;
}
String sparkUrlProp = property.getProperty("zeppelin.spark.uiWebUrl", "");
if (!sparkUrlProp.isEmpty()) {
return sparkUrlProp;
}
if (sparkVersion.newerThanEquals(SparkVersion.SPARK_2_0_0)) {
Option<String> uiWebUrlOption = (Option<String>) Utils.invokeMethod(sc, "uiWebUrl");
if (uiWebUrlOption.isDefined()) {

2
spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java
View file

@ -347,7 +347,7 @@ public class SparkInterpreterTest {
}
String sparkUIUrl = repl.getSparkUIUrl();
assertNotNull(jobUrl);
assertTrue(jobUrl.startsWith(sparkUIUrl + "/jobs/job?id="));
assertTrue(jobUrl.startsWith(sparkUIUrl + "/jobs/job/?id="));
}
}