Skip to content

Make zeppelin work with CDH5.7.0 #868

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
krisgeus wants to merge 5 commits into from
Closed

Make zeppelin work with CDH5.7.0 #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50717dd
Use slf4j instead of parquet bundled one since parquet doesn't bundle…
Apr 29, 2016
24ea584
method classServerUri not available in cdh5.7.0 Spark version. Only s…
Apr 29, 2016
146b524
Don't use extra driver classpath option since I use SPARK_CLASSPATH i…
Apr 29, 2016
488cce6
Added logging and comments to clarify reason not throwing exception
May 10, 2016
e33d520
Revert "Don't use extra driver classpath option since I use SPARK_CLA…
May 13, 2016
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
12 changes: 9 additions & 3 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 @@ -276,15 +276,21 @@ public SparkContext createSparkContext() {
classServerUri = (String) classServer.invoke(interpreter.intp());
} catch (NoSuchMethodException | SecurityException | IllegalAccessException
| IllegalArgumentException | InvocationTargetException e) {
throw new InterpreterException(e);
// continue instead of: throw new InterpreterException(e);
Copy link
Copy Markdown
Member

@felixcheung felixcheung May 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's add a logger.warn() call here

Copy link
Copy Markdown
Member

@felixcheung felixcheung May 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and please add a comment on why this is broken?

Copy link
Copy Markdown
Author

@krisgeus krisgeus May 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added in commit 488cce6

// Newer Spark versions (like the patched CDH5.7.0 one) don't contain this method
logger.warn(String.format("Spark method classServerUri not available due to: [%s]",
e.getMessage()));
}
}

SparkConf conf =
new SparkConf()
.setMaster(getProperty("master"))
.setAppName(getProperty("spark.app.name"))
.set("spark.repl.class.uri", classServerUri);
.setAppName(getProperty("spark.app.name"));

if (classServerUri != null) {
conf.set("spark.repl.class.uri", classServerUri);
}

if (jars.length > 0) {
conf.setJars(jars);
Expand Down
4 changes: 2 additions & 2 deletions spark/src/main/java/org/apache/zeppelin/spark/ZeppelinR.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import org.apache.zeppelin.interpreter.InterpreterException;
import org.apache.zeppelin.interpreter.InterpreterOutput;
import org.apache.zeppelin.interpreter.InterpreterOutputListener;
import parquet.org.slf4j.Logger;
import parquet.org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.*;
import java.util.Collections;
Expand Down