openstack/sahara
Code Issues Proposed changes

Merge "Inject drivers to jars in Ambari Spark engine"

Browse Source
This commit is contained in:
Jenkins 2016-03-15 16:45:20 +00:00 committed by Gerrit Code Review
commit 418ec8edbb
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sahara/plugins/ambari/edp_engine.py
View File

@ -103,6 +103,8 @@ class EDPSparkEngine(spark_engine.SparkJobEngine):
_get_hadoop_openstack_jar_location(self.master),
_get_jackson_core(self.master)]
self.plugin_params['driver-class-path'] = ":".join(driver_classpath)
self.plugin_params['drivers-to-jars'] = driver_classpath
return super(EDPSparkEngine, self).run_job(job_execution)
def validate_job_execution(self, cluster, job, data):

3
sahara/service/edp/spark/engine.py
View File

@ -222,7 +222,8 @@ class SparkJobEngine(base_engine.JobEngine):
indep_params["app_jar"] = paths.pop(0)
indep_params["job_class"] = (
updated_job_configs["configs"]["edp.java.main_class"])
if self.plugin_params.get('drivers-to-jars', None):
paths.extend(self.plugin_params['drivers-to-jars'])
# If we uploaded builtins then we are using a wrapper jar. It will
# be the first one on the builtin list and the original app_jar needs
# to be added to the 'additional' jars