openstack/deb-sahara
Code Issues Proposed changes

Merge "Add a common Hive and Pig config in workflow_factory"

Browse Source
This commit is contained in:
Jenkins 2016-01-20 19:05:37 +00:00 committed by Gerrit Code Review
commit 8f6df19921
3 changed files with 3830 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sahara/service/edp/oozie/workflow_creator/workflow_factory.py
View File

@ -316,15 +316,13 @@ def get_possible_job_config(job_type):
if edp.compare_job_type(job_type,
edp.JOB_TYPE_MAPREDUCE, edp.JOB_TYPE_PIG):
# TODO(nmakhotkin): Here we need return config based on specific plugin
cfg = xmlutils.load_hadoop_xml_defaults(
'plugins/vanilla/v2_6_0/resources/mapred-default.xml')
'service/edp/resources/mapred-default.xml')
if edp.compare_job_type(job_type, edp.JOB_TYPE_MAPREDUCE):
cfg += get_possible_mapreduce_configs()
elif edp.compare_job_type(job_type, edp.JOB_TYPE_HIVE):
# TODO(nmakhotkin): Here we need return config based on specific plugin
cfg = xmlutils.load_hadoop_xml_defaults(
'plugins/vanilla/v2_6_0/resources/hive-default.xml')
'service/edp/resources/hive-default.xml')
config = {'configs': cfg}
if edp.compare_job_type(job_type, edp.JOB_TYPE_PIG, edp.JOB_TYPE_HIVE):

1873
sahara/service/edp/resources/hive-default.xml Normal file
View File

File diff suppressed because it is too large Load Diff

1955
sahara/service/edp/resources/mapred-default.xml Normal file
View File

File diff suppressed because it is too large Load Diff