From fd887d80fd4241ea3be77699d27227287f366a95 Mon Sep 17 00:00:00 2001 From: Luciano Resende Date: Wed, 22 Mar 2017 11:26:26 -0700 Subject: [PATCH] [TOREE-397] Avoid hardcoding the deploy mode property By checking if a proper spark.submit.deployMode property is available in the sparkConf enables choosing the deploy mode by using system properties such as $SPARK_OPTS. This change continues to use client mode if no configuration was provided. --- .../main/scala/org/apache/toree/kernel/api/Kernel.scala | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kernel/src/main/scala/org/apache/toree/kernel/api/Kernel.scala b/kernel/src/main/scala/org/apache/toree/kernel/api/Kernel.scala index 952842cde..417983bbd 100644 --- a/kernel/src/main/scala/org/apache/toree/kernel/api/Kernel.scala +++ b/kernel/src/main/scala/org/apache/toree/kernel/api/Kernel.scala @@ -366,8 +366,13 @@ class Kernel ( // TODO: Think of a better way to test without exposing this protected[toree] def createSparkConf(conf: SparkConf) = { - logger.info("Setting deployMode to client") - conf.set("spark.submit.deployMode", "client") + if(conf.contains("spark.submit.deployMode")) { + logger.info("Utilizing deploy mode: " + conf.get("spark.submit.deployMode")) + } else { + logger.info("Setting deployMode to client") + conf.set("spark.submit.deployMode", "client") + } + conf }