From 33fe09039f6fda31edb5262a773896831c549697 Mon Sep 17 00:00:00 2001 From: Craig Ching Date: Sun, 8 Nov 2015 09:09:37 -0600 Subject: [PATCH] Allow the spark app name to be configurable --- conf/zeppelin-env.sh.template | 1 + .../main/java/org/apache/zeppelin/spark/SparkInterpreter.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/zeppelin-env.sh.template b/conf/zeppelin-env.sh.template index fe133ba348e..712dfb78e06 100644 --- a/conf/zeppelin-env.sh.template +++ b/conf/zeppelin-env.sh.template @@ -41,6 +41,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) Specify the spark app name. Useful if you have more than one zeppelin instance in a spark cluster ## Use embedded spark binaries ## ## without SPARK_HOME defined, Zeppelin still able to run spark interpreter process using embedded spark binaries. 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 77d4986bf4e..a55f481cab5 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java @@ -90,7 +90,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")