[incubator-amaterasu] 24/36: spark_conf pulled from spark-submit conf if exists

[ya...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yaniv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-amaterasu.git

commit a1b78bbecf533b38153eb11cd24b0c4d0daff882
Author: Nadav Har Tzvi <na...@apache.org>
AuthorDate: Fri Apr 26 11:00:52 2019 +0300

    spark_conf pulled from spark-submit conf if exists
---
 sdk_python/amaterasu/pyspark/runtime.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/sdk_python/amaterasu/pyspark/runtime.py b/sdk_python/amaterasu/pyspark/runtime.py
index d7ad20c..da69205 100644
--- a/sdk_python/amaterasu/pyspark/runtime.py
+++ b/sdk_python/amaterasu/pyspark/runtime.py
@@ -29,11 +29,9 @@ class AmaContextBuilder(BaseAmaContextBuilder):
 
     def __init__(self):
         super().__init__()
-        if self.ama_conf:
-            self.spark_conf = SparkConf()\
-                .setAppName('amaterasu-{}-{}'.format(self.ama_conf.runtime.jobId, self.ama_conf.runtime.actionName))\
-                .setMaster(self.ama_conf.env.master)
-        else:
+        try:
+            self.spark_conf = spark.conf
+        except:
             self.spark_conf = SparkConf()
 
     def setMaster(self, master_uri) -> "AmaContextBuilder":