Sfoglia il codice sorgente

[oozie] Fixing UnboundLocalError issue in coordinator from HDFS submission (#1191)

Co-authored-by: Romain Rigaux <romain.rigaux@gmail.com>
王添 5 anni fa
parent
commit
9d0136c135

+ 9 - 9
apps/oozie/src/oozie/forms.py

@@ -43,24 +43,24 @@ class ParameterForm(forms.Form):
   value = forms.CharField(max_length=12288, required=False)
 
   NON_PARAMETERS = (
-      'user.name',
-      'mapreduce.job.user.name',
-      'wf_application_path',
-      'jobTracker',
-      'nameNode',
       'hue-id-w',
       'hue-id-c',
       'hue-id-b',
       'hue-id-b',
       'security_enabled',
-      'oozie.wf.rerun.failnodes',
-      'dryrun',
-      'send_email'
+      'dryrun'
   )
 
   RERUN_HIDE_PARAMETERS = (
       'security_enabled',
-      'dryrun'
+      'dryrun',
+      'user.name',
+      'mapreduce.job.user.name',
+      'wf_application_path',
+      'jobTracker',
+      'nameNode',
+      'oozie.wf.rerun.failnodes',
+      'send_email'
   )
 
   @staticmethod

+ 1 - 1
apps/oozie/src/oozie/templates/editor/submit_job_popup.mako

@@ -39,7 +39,7 @@
           % endfor
           <div class="fieldWrapper">
             <div class="row-fluid
-              % if form['name'].form.initial.get('name') == 'oozie.use.system.libpath':
+              % if form['name'].form.initial.get('name').startswith('oozie.') or form['name'].form.initial.get('name') in form.RERUN_HIDE_PARAMETERS:
                 hide
               % endif
               ">

+ 0 - 6
apps/oozie/src/oozie/views/dashboard.py

@@ -968,12 +968,6 @@ def submit_external_job(request, application_path):
     params_form = ParametersFormSet(request.POST)
 
     if params_form.is_valid():
-      if application_name == 'coordinator.xml':
-        external_properties = Submission(request.user, fs=request.fs, jt=request.jt).get_external_parameters(application_path)
-        non_parameters = ParameterForm.get_non_parameters(external_properties)
-        mapping = non_parameters
-      else :
-        mapping = {}  
       mapping = dict([(param['name'], param['value']) for param in params_form.cleaned_data])
       mapping['dryrun'] = request.POST.get('dryrun_checkbox') == 'on'
       application_name = os.path.basename(application_path)