zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject zeppelin git commit: ZEPPELIN-1284. Unable to run paragraph with default interpreter
Date Mon, 29 Aug 2016 00:55:26 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.6 57a8451f9 -> f1bdafbbf


ZEPPELIN-1284. Unable to run paragraph with default interpreter

### What is this PR for?
This issue happens when SPARK_HOME is not defined. In this case, you are using spark 2.0 and
scala-2.10

### What type of PR is it?
[Bug Fix]

### Todos
* [ ] - Task

### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-1284

### How should this be tested?
Run the following command, and then run the tutorial note in local mode
```
mvn package -DskipTests -Ppyspark -Psparkr -Pyarn -Phadoop-2.7 -Pspark-2.0
```

### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: Jeff Zhang <zjffdu@apache.org>

Closes #1347 from zjffdu/ZEPPELIN-1284 and squashes the following commits:

d9d9d56 [Jeff Zhang] ZEPPELIN-1284. Unable to run paragraph with default interpreter

(cherry picked from commit 5f1208bdbace9a56ae2744193880a2be9ce118df)
Signed-off-by: Lee moon soo <moon@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f1bdafbb
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f1bdafbb
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f1bdafbb

Branch: refs/heads/branch-0.6
Commit: f1bdafbbfcaf73439dc9752535cff09fa8c5bb3f
Parents: 57a8451
Author: Jeff Zhang <zjffdu@apache.org>
Authored: Fri Aug 19 19:19:20 2016 +0800
Committer: Lee moon soo <moon@apache.org>
Committed: Mon Aug 29 10:55:21 2016 +1000

----------------------------------------------------------------------
 .../main/java/org/apache/zeppelin/spark/SparkInterpreter.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f1bdafbb/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
index bdc6129..3ae6c0a 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -299,7 +299,9 @@ public class SparkInterpreter extends Interpreter {
     String execUri = System.getenv("SPARK_EXECUTOR_URI");
     conf.setAppName(getProperty("spark.app.name"));
 
-    conf.set("spark.repl.class.outputDir", outputDir.getAbsolutePath());
+    if (outputDir != null) {
+      conf.set("spark.repl.class.outputDir", outputDir.getAbsolutePath());
+    }
 
     if (execUri != null) {
       conf.set("spark.executor.uri", execUri);


Mime
View raw message