ソースを参照

HUE-6598 [jb] Add queue or group name to the job list

Romain Rigaux 8 年 前
コミット
4f28c81ac6

+ 2 - 1
apps/jobbrowser/src/jobbrowser/apis/bundle_api.py

@@ -56,8 +56,9 @@ class BundleApi(Api):
         'type': 'bundle',
         'user': app['user'],
         'progress': app['progress'],
+        'queue': app['group'],
         'duration': app['durationInMillis'],
-        'submitted': app['kickoffTimeInMillis']
+        'submitted': app['kickoffTimeInMillis'] * 1000
       } for app in massaged_oozie_jobs_for_json(jobs.jobs, self.user)['jobs']],
       'total': jobs.total
     }

+ 1 - 0
apps/jobbrowser/src/jobbrowser/apis/data_eng_api.py

@@ -44,6 +44,7 @@ class DataEngClusterApi(Api):
         'type': app['serviceType'],
         'user': app['clusterName'].split('-', 1)[0],
         'progress': 100,
+        'queue': 'group',
         'duration': 10 * 3600,
         'submitted': app['creationDate']
       } for app in jobs['clusters']],

+ 1 - 0
apps/jobbrowser/src/jobbrowser/apis/job_api.py

@@ -112,6 +112,7 @@ class YarnApi(Api):
         'apiStatus': self._api_status(app['yarnStatus']),
         'user': app['user'],
         'progress': app['progress'],
+        'queue': app['queueName'],
         'duration': app['durationMs'],
         'submitted': app['startTimeMs']
       } for app in apps],

+ 2 - 1
apps/jobbrowser/src/jobbrowser/apis/schedule_api.py

@@ -56,8 +56,9 @@ class ScheduleApi(Api):
         'type': 'schedule',
         'user': app['user'],
         'progress': app['progress'],
+        'queue': app['group'],
         'duration': app['durationInMillis'],
-        'submitted': app['startTimeInMillis']
+        'submitted': app['startTimeInMillis'] * 1000
       } for app in massaged_oozie_jobs_for_json(jobs.jobs, self.user)['jobs']],
       'total': jobs.total
     }

+ 2 - 1
apps/jobbrowser/src/jobbrowser/apis/workflow_api.py

@@ -54,8 +54,9 @@ class WorkflowApi(Api):
         'type': 'workflow',
         'user': app['user'],
         'progress': app['progress'],
+        'queue': app['group'],
         'duration': app['durationInMillis'],
-        'submitted': app['startTimeInMillis']
+        'submitted': app['startTimeInMillis'] * 1000
       } for app in massaged_oozie_jobs_for_json(wf_list.jobs, self.user)['jobs']],
       'total': wf_list.total
     }

+ 4 - 3
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -188,7 +188,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
                     <th width="1%"><div class="select-all hueCheckbox fa" data-bind="hueCheckAll: { allValues: jobs.apps, selectedValues: jobs.selectedJobs }"></div></th>
                     <th width="15%">${_('Id')}</th>
                     <th width="20%">${_('Name')}</th>
-                    <th width="3%">${_('Duration')}</th>
+                    <th width="3%">${_('Queue')}</th>
                     <th width="10%">${_('Started')}</th>
                     <th width="7%">${_('Type')}</th>
                     <th width="5%">${_('Status')}</th>
@@ -203,7 +203,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
                       </td>
                       <td data-bind="text: id"></td>
                       <td data-bind="text: name"></td>
-                      <td data-bind="text: duration().toHHMMSS()"></td>
+                      <td data-bind="text: queue"></td>
                       <td data-bind="moment: {data: submitted, format: 'LLL'}"></td>
                       <td data-bind="text: type"></td>
                       <td data-bind="text: status"></td>
@@ -902,7 +902,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
           <li class="nav-header">${ _('Duration') }</li>
           <li><span data-bind="text: duration"></span></li>
           <li class="nav-header">${ _('Submitted') }</li>
-          <li><span data-bind="text: submitted"></span></li>
+          <li><span data-bind="moment: {data: submitted, format: 'LLL'}"></span></li>
 
           <li class="nav-header">${ _('Variables') }</li>
           <li>
@@ -1445,6 +1445,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
       });
 
       self.user = ko.observableDefault(job.user);
+      self.queue = ko.observableDefault(job.queue);
       self.cluster = ko.observableDefault(job.cluster);
       self.duration = ko.observableDefault(job.duration);
       self.submitted = ko.observableDefault(job.submitted);

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

@@ -1101,6 +1101,7 @@ def massaged_oozie_jobs_for_json(oozie_jobs, user, just_sla=False):
         'concurrency': hasattr(job, 'concurrency') and job.concurrency or None,
         'endTimeInMillis': job.endTime and time.mktime(job.endTime) or 0,
         'status': job.status,
+        'group': job.group,
         'isRunning': job.is_running(),
         'duration': duration_millis and format_duration_in_millis(duration_millis) or None,
         'durationInMillis': duration_millis,