Skip to content

ZEPPELIN-1267. PySparkInterpreter doesn't work in spark 2.0 #1260

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
zjffdu wants to merge 1 commit into from
Closed

ZEPPELIN-1267. PySparkInterpreter doesn't work in spark 2.0 #1260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions spark/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 @@ -329,6 +329,7 @@ public Object createSparkSession() {
}
}

setupConfForPySpark(conf);
Class SparkSession = Utils.findClass("org.apache.spark.sql.SparkSession");
Object builder = Utils.invokeStaticMethod(SparkSession, "builder");
Utils.invokeMethod(builder, "config", new Class[]{ SparkConf.class }, new Object[]{ conf });
Expand Down Expand Up @@ -442,8 +443,12 @@ public SparkContext createSparkContext_1() {
conf.set(key, val);
}
}
setupConfForPySpark(conf);
SparkContext sparkContext = new SparkContext(conf);
return sparkContext;
}

//TODO(jongyoul): Move these codes into PySparkInterpreter.java
private void setupConfForPySpark(SparkConf conf) {
String pysparkBasePath = getSystemDefault("SPARK_HOME", null, null);
File pysparkPath;
if (null == pysparkBasePath) {
Expand All @@ -456,7 +461,8 @@ public SparkContext createSparkContext_1() {
}

//Only one of py4j-0.9-src.zip and py4j-0.8.2.1-src.zip should exist
String[] pythonLibs = new String[]{"pyspark.zip", "py4j-0.9-src.zip", "py4j-0.8.2.1-src.zip"};
String[] pythonLibs = new String[]{"pyspark.zip", "py4j-0.9-src.zip", "py4j-0.8.2.1-src.zip",
"py4j-0.10.1-src.zip"};
ArrayList<String> pythonLibUris = new ArrayList<>();
for (String lib : pythonLibs) {
File libFile = new File(pysparkPath, lib);
Expand Down Expand Up @@ -486,9 +492,6 @@ public SparkContext createSparkContext_1() {
if (getProperty("master").equals("yarn-client")) {
conf.set("spark.yarn.isPython", "true");
}

SparkContext sparkContext = new SparkContext(conf);
return sparkContext;
}

static final String toString(Object o) {
Expand Down