Repository: zeppelin Updated Branches: refs/heads/branch-0.7 e667bb5a9 -> 4298a426b
ZEPPELIN-2893. Pass non spark.* of spark interpreter properties to spark app driver ### What is this PR for? Straightforward change for allowing pass non spark.* properties to spark app driver. See discussion here http://apache-zeppelin-users-incubating-mailing-list.75479.x6.nabble.com/Setting-spark-config-properties-in-Zeppelin-0-7-2-td6143.html ### What type of PR is it? [Bug Fix ] ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-2893 ### How should this be tested? Unit test is added ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff Zhang <zjf...@apache.org> Closes #2561 from zjffdu/ZEPPELIN-2893 and squashes the following commits: 1342527 [Jeff Zhang] ZEPPELIN-2893. Pass non spark.* of spark interpreter properties to spark app driver (cherry picked from commit 1e1b95ea1dc5db408773263837c9cbbd6f66b288) Signed-off-by: Jeff Zhang <zjf...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4298a426 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4298a426 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4298a426 Branch: refs/heads/branch-0.7 Commit: 4298a426b79bee0b25bac3e27631d483f06a172b Parents: e667bb5 Author: Jeff Zhang <zjf...@apache.org> Authored: Sun Sep 3 10:39:37 2017 +0800 Committer: Jeff Zhang <zjf...@apache.org> Committed: Thu Sep 7 06:36:12 2017 +0800 ---------------------------------------------------------------------- docs/interpreter/spark.md | 7 +++++ .../apache/zeppelin/spark/SparkInterpreter.java | 27 +++++++++++++++----- .../zeppelin/spark/SparkInterpreterTest.java | 9 ++++++- 3 files changed, 36 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4298a426/docs/interpreter/spark.md ---------------------------------------------------------------------- diff --git a/docs/interpreter/spark.md b/docs/interpreter/spark.md index 6d92561..5779177 100644 --- a/docs/interpreter/spark.md +++ b/docs/interpreter/spark.md @@ -184,6 +184,13 @@ Staring from 0.6.1 SparkSession is available as variable `spark` when you are us <a name="dependencyloading"> </a> +### How to pass property to SparkConf + +There're 2 kinds of properties that would be passed to SparkConf + + * Standard spark property (prefix with `spark.`). e.g. `spark.executor.memory` will be passed to `SparkConf` + * Non-standard spark property (prefix with `zeppelin.spark.`). e.g. `zeppelin.spark.property_1`, `property_1` will be passed to `SparkConf` + ## Dependency Management There are two ways to load external libraries in Spark interpreter. First is using interpreter setting menu and second is loading Spark properties. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4298a426/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 e7bf265..5b6dc76 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java @@ -343,9 +343,16 @@ public class SparkInterpreter extends Interpreter { for (Object k : intpProperty.keySet()) { String key = (String) k; String val = toString(intpProperty.get(key)); - if (key.startsWith("spark.") && !val.trim().isEmpty()) { - logger.debug(String.format("SparkConf: key = [%s], value = [%s]", key, val)); - conf.set(key, val); + if (!val.trim().isEmpty()) { + if (key.startsWith("spark.")) { + logger.debug(String.format("SparkConf: key = [%s], value = [%s]", key, val)); + conf.set(key, val); + } + if (key.startsWith("zeppelin.spark.")) { + String sparkPropertyKey = key.substring("zeppelin.spark.".length()); + logger.debug(String.format("SparkConf: key = [%s], value = [%s]", sparkPropertyKey, val)); + conf.set(sparkPropertyKey, val); + } } } @@ -474,9 +481,17 @@ public class SparkInterpreter extends Interpreter { for (Object k : intpProperty.keySet()) { String key = (String) k; String val = toString(intpProperty.get(key)); - if (key.startsWith("spark.") && !val.trim().isEmpty()) { - logger.debug(String.format("SparkConf: key = [%s], value = [%s]", key, val)); - conf.set(key, val); + if (!val.trim().isEmpty()) { + if (key.startsWith("spark.")) { + logger.debug(String.format("SparkConf: key = [%s], value = [%s]", key, val)); + conf.set(key, val); + } + + if (key.startsWith("zeppelin.spark.")) { + String sparkPropertyKey = key.substring("zeppelin.spark.".length()); + logger.debug(String.format("SparkConf: key = [%s], value = [%s]", sparkPropertyKey, val)); + conf.set(sparkPropertyKey, val); + } } } setupConfForPySpark(conf); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4298a426/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java ---------------------------------------------------------------------- diff --git a/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java b/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java index 58b5e91..d73bd0c 100644 --- a/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java +++ b/spark/src/test/java/org/apache/zeppelin/spark/SparkInterpreterTest.java @@ -74,7 +74,7 @@ public class SparkInterpreterTest { p.setProperty("zeppelin.spark.maxResult", "1000"); p.setProperty("zeppelin.spark.importImplicit", "true"); p.setProperty("zeppelin.dep.localrepo", tmpDir.newFolder().getAbsolutePath()); - + p.setProperty("zeppelin.spark.property_1", "value_1"); return p; } @@ -122,6 +122,13 @@ public class SparkInterpreterTest { } @Test + public void testNonStandardSparkProperties() throws IOException { + // throw NoSuchElementException if no such property is found + InterpreterResult result = repl.interpret("sc.getConf.get(\"property_1\")", context); + assertEquals(InterpreterResult.Code.SUCCESS, result.code()); + } + + @Test public void testNextLineInvocation() { assertEquals(InterpreterResult.Code.SUCCESS, repl.interpret("\"123\"\n.toInt", context).code()); }
