Repository: incubator-zeppelin Updated Branches: refs/heads/master 025acd364 -> 08b20e16a
WIP: Add env var support to spark properties Add env var support to set defaults: - `spark.app.name` => `SPARK_APP_NAME` - `spark.executor.memory` => `SPARK_EXECUTOR_MEMORY` - `spark.cores.max` => `SPARK_CORES_MAX` Author: Dr. Stefan Schimanski <[email protected]> Closes #664 from sttts/sttts-spark-property-envs and squashes the following commits: 6055d2e [Dr. Stefan Schimanski] Add env var support to spark properties Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/08b20e16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/08b20e16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/08b20e16 Branch: refs/heads/master Commit: 08b20e16abe4d7f61c464316164a0d8e548dc2e8 Parents: 025acd3 Author: Dr. Stefan Schimanski <[email protected]> Authored: Thu Jan 21 11:45:40 2016 +0100 Committer: Lee moon soo <[email protected]> Committed: Sat Feb 6 15:24:06 2016 +0900 ---------------------------------------------------------------------- conf/zeppelin-env.sh.template | 1 + .../main/java/org/apache/zeppelin/spark/SparkInterpreter.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/08b20e16/conf/zeppelin-env.sh.template ---------------------------------------------------------------------- diff --git a/conf/zeppelin-env.sh.template b/conf/zeppelin-env.sh.template index 2fa5311..0d2c6f0 100644 --- a/conf/zeppelin-env.sh.template +++ b/conf/zeppelin-env.sh.template @@ -43,6 +43,7 @@ ## # export SPARK_HOME # (required) When it is defined, load it instead of Zeppelin embedded Spark libraries # export SPARK_SUBMIT_OPTIONS # (optional) extra options to pass to spark submit. eg) "--driver-memory 512M --executor-memory 1G". +# export SPARK_APP_NAME # (optional) The name of spark application. ## Use embedded spark binaries ## ## without SPARK_HOME defined, Zeppelin still able to run spark interpreter process using embedded spark binaries. http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/08b20e16/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 d8e0f81..be891d8 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java @@ -87,7 +87,9 @@ public class SparkInterpreter extends Interpreter { "spark", SparkInterpreter.class.getName(), new InterpreterPropertyBuilder() - .add("spark.app.name", "Zeppelin", "The name of spark application.") + .add("spark.app.name", + getSystemDefault("SPARK_APP_NAME", "spark.app.name", "Zeppelin"), + "The name of spark application.") .add("master", getSystemDefault("MASTER", "spark.master", "local[*]"), "Spark master uri. ex) spark://masterhost:7077")
