Skip to content

[ZEPPELIN-4226] Fix "View in Spark web UI" in kubernetes mode #3451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Leemoonsoo wants to merge 2 commits into from
Closed

[ZEPPELIN-4226] Fix "View in Spark web UI" in kubernetes mode #3451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a33c3b2
pickup SparkUI address from zeppelin.spark.uiWebUrl
Leemoonsoo Sep 18, 2019
7e34542
use StringUtils.isBlank
Leemoonsoo Sep 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ public class SparkInterpreter extends AbstractInterpreter {

private SparkVersion sparkVersion;
private boolean enableSupportedVersionCheck;
private String sparkUrl;


public SparkInterpreter(Properties properties) {
super(properties);
Expand Down Expand Up @@ -109,11 +107,6 @@ public void open() throws InterpreterException {
}
sqlContext = this.innerInterpreter.getSqlContext();
sparkSession = this.innerInterpreter.getSparkSession();
sparkUrl = this.innerInterpreter.getSparkUrl();
String sparkUrlProp = getProperty("zeppelin.spark.uiWebUrl", "");
if (!StringUtils.isBlank(sparkUrlProp)) {
sparkUrl = sparkUrlProp;
}

SESSION_NUM.incrementAndGet();
} catch (Exception e) {
Expand Down Expand Up @@ -260,10 +253,6 @@ private List<String> getDependencyFiles() throws InterpreterException {
return depFiles;
}

public String getSparkUIUrl() {
return sparkUrl;
}

public boolean isUnsupportedSparkVersion() {
return enableSupportedVersionCheck && sparkVersion.isUnsupportedVersion();
}
Expand Down
7 changes: 4 additions & 3 deletions spark/interpreter/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;


public class SparkInterpreterTest {
Expand Down Expand Up @@ -89,8 +90,6 @@ public void testSparkInterpreter() throws IOException, InterruptedException, Int
interpreter.setInterpreterGroup(mock(InterpreterGroup.class));
interpreter.open();

assertEquals("fake_spark_weburl", interpreter.getSparkUIUrl());

InterpreterResult result = interpreter.interpret("val a=\"hello world\"", getInterpreterContext());
assertEquals(InterpreterResult.Code.SUCCESS, result.code());
assertEquals("a: String = hello world\n", output);
Expand Down Expand Up @@ -181,7 +180,9 @@ public void testSparkInterpreter() throws IOException, InterruptedException, Int
assertEquals("pid_2", captorEvent.getValue().get("paraId"));

// spark job url is sent
verify(mockRemoteEventClient).onParaInfosReceived(any(Map.class));
ArgumentCaptor<Map> onParaInfosReceivedArg = ArgumentCaptor.forClass(Map.class);
verify(mockRemoteEventClient).onParaInfosReceived(onParaInfosReceivedArg.capture());
assertTrue(((String) onParaInfosReceivedArg.getValue().get("jobUrl")).startsWith("fake_spark_weburl"));

// case class
result = interpreter.interpret("val bankText = sc.textFile(\"bank.csv\")", getInterpreterContext());
Expand Down
7 changes: 6 additions & 1 deletion ...ark-scala-parent/src/main/scala/org/apache/zeppelin/spark/BaseSparkScalaInterpreter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import java.net.URLClassLoader
import java.nio.file.Paths
import java.util.concurrent.atomic.AtomicInteger

import org.apache.commons.lang3.StringUtils
import org.apache.spark.sql.SQLContext
import org.apache.spark.{SparkConf, SparkContext}
import org.apache.zeppelin.interpreter.util.InterpreterOutputStream
Expand Down Expand Up @@ -303,7 +304,11 @@ abstract class BaseSparkScalaInterpreter(val conf: SparkConf,

protected def createZeppelinContext(): Unit = {
val sparkShims = SparkShims.getInstance(sc.version, properties)
sparkShims.setupSparkListener(sc.master, sparkUrl, InterpreterContext.get)
var webUiUrl = properties.getProperty("zeppelin.spark.uiWebUrl");
if (StringUtils.isBlank(webUiUrl)) {
webUiUrl = sparkUrl;
}
sparkShims.setupSparkListener(sc.master, webUiUrl, InterpreterContext.get)

z = new SparkZeppelinContext(sc, sparkShims,
interpreterGroup.getInterpreterHookRegistry,
Expand Down