openstack/horizon
Code Issues Proposed changes

Merge "Sahara Data Processing EDP Job Add HBase common lib checkbox"

Browse Source
This commit is contained in:
Jenkins 2015-04-30 17:40:16 +00:00 committed by Gerrit Code Review
commit f965ea4baa
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/dashboards/project/data_processing/jobs/templates/data_processing.jobs/config_template.html
View File

@ -165,6 +165,9 @@
$("[name=streaming_mapper]").closest(".form-group").hide(); $("[name=streaming_mapper]").closest(".form-group").hide();
$("[name=streaming_reducer]").closest(".form-group").hide(); $("[name=streaming_reducer]").closest(".form-group").hide();
} }
if (job_type != "Java") {
$("[name=hbase_common_lib]").closest(".form-group").hide();
}
} }
properties = {}; properties = {};

12
openstack_dashboard/dashboards/project/data_processing/jobs/workflows/launch.py
View File

@ -132,6 +132,7 @@ class JobConfigAction(workflows.Action):
EDP_MAPPER = "edp.streaming.mapper" EDP_MAPPER = "edp.streaming.mapper"
EDP_REDUCER = "edp.streaming.reducer" EDP_REDUCER = "edp.streaming.reducer"
EDP_PREFIX = "edp." EDP_PREFIX = "edp."
EDP_HBASE_COMMON_LIB = "edp.hbase_common_lib"
property_name = forms.ChoiceField( property_name = forms.ChoiceField(
required=False, required=False,
@ -163,6 +164,11 @@ class JobConfigAction(workflows.Action):
streaming_reducer = forms.CharField(label=_("Reducer")) streaming_reducer = forms.CharField(label=_("Reducer"))
hbase_common_lib = forms.BooleanField(
label=_("Use HBase Common library"),
help_text=_("Run HBase EDP Jobs with common HBase library on HDFS"),
required=False, initial=True)
def __init__(self, request, *args, **kwargs): def __init__(self, request, *args, **kwargs):
super(JobConfigAction, self).__init__(request, *args, **kwargs) super(JobConfigAction, self).__init__(request, *args, **kwargs)
job_ex_id = request.REQUEST.get("job_execution_id") job_ex_id = request.REQUEST.get("job_execution_id")
@ -197,6 +203,9 @@ class JobConfigAction(workflows.Action):
if self.EDP_REDUCER in edp_configs: if self.EDP_REDUCER in edp_configs:
self.fields['streaming_reducer'].initial = ( self.fields['streaming_reducer'].initial = (
edp_configs[self.EDP_REDUCER]) edp_configs[self.EDP_REDUCER])
if self.EDP_HBASE_COMMON_LIB in edp_configs:
self.fields['hbase_common_lib'].initial = (
edp_configs[self.EDP_HBASE_COMMON_LIB])
def clean(self): def clean(self):
cleaned_data = super(workflows.Action, self).clean() cleaned_data = super(workflows.Action, self).clean()
@ -282,6 +291,9 @@ class JobConfig(workflows.Step):
data.get("main_class", "")) data.get("main_class", ""))
context["job_config"]["configs"][JobConfigAction.JAVA_OPTS] = ( context["job_config"]["configs"][JobConfigAction.JAVA_OPTS] = (
data.get("java_opts", "")) data.get("java_opts", ""))
context["job_config"]["configs"][
JobConfigAction.EDP_HBASE_COMMON_LIB] = (
data.get("hbase_common_lib", True))
elif job_type == "MapReduce.Streaming": elif job_type == "MapReduce.Streaming":
context["job_config"]["configs"][JobConfigAction.EDP_MAPPER] = ( context["job_config"]["configs"][JobConfigAction.EDP_MAPPER] = (
data.get("streaming_mapper", "")) data.get("streaming_mapper", ""))