Browse Source

HUE-1820 [jb] Finishing jobs are red and stuck

Added 'STARTED' and 'FINISHING' as possible statuses
Enrico Berti 12 years ago
parent
commit
b6ad0cc

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/job.mako

@@ -470,7 +470,7 @@ $(document).ready(function () {
     }
     $("#jobDuration").html('<span title="' + emptyStringIfNull(job.durationMs) + '">' + (job.isRetired ? '${_('N/A')}' : emptyStringIfNull(job.durationFormatted)) + '</span>');
 
-    if (['RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED'].indexOf(job.status.toUpperCase()) == -1) {
+    if (['RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED', 'STARTED', 'FINISHING'].indexOf(job.status.toUpperCase()) == -1) {
       window.clearInterval(_runningInterval);
       removeFailedTasksFromRecent();
       $.jHueTitleUpdater.reset();

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/jobs.mako

@@ -180,7 +180,7 @@ ${ components.menubar() }
         // Update updateableRows.
         for(var i = 0; i < data.length; ++i) {
           var job = data[i];
-          if (['RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED'].indexOf(job.status.toUpperCase()) > -1) {
+          if (['RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED', 'STARTED', 'FINISHING'].indexOf(job.status.toUpperCase()) > -1) {
             updateableRows[job.shortId] = job;
 
             var nNodes = jobTable.fnGetNodes();

+ 1 - 1
apps/jobbrowser/static/js/utils.js

@@ -72,7 +72,7 @@ function getStatusClass(status, prefix) {
   else if (['RUNNING', 'ACCEPTED', 'READY',
     'PREP', 'WAITING', 'SUSPENDED',
     'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED',
-    'SUBMITTED', 'SUSPENDEDWITHERROR', 'PAUSEDWITHERROR'].indexOf(status) > -1) {
+    'SUBMITTED', 'SUSPENDEDWITHERROR', 'PAUSEDWITHERROR', 'FINISHING', 'STARTED'].indexOf(status) > -1) {
     klass = prefix + "warning";
   }
   else {

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_bundles.mako

@@ -364,7 +364,7 @@ ${layout.menubar(section='bundles', dashboard=True)}
                       '>${ _('Resume') }</a>';
             }
             if (foundRow == null) {
-              if (['RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED'].indexOf(bundle.status) > -1) {
+              if (['RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED', 'STARTED', 'FINISHING'].indexOf(bundle.status) > -1) {
                 try {
                   runningTable.fnAddData([
                     emptyStringIfNull(bundle.kickoffTime),

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako

@@ -376,7 +376,7 @@ ${layout.menubar(section='coordinators', dashboard=True)}
                       '>${ _('Resume') }</a>';
             }
             if (foundRow == null) {
-              if (['RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED'].indexOf(coord.status) > -1) {
+              if (['RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED', 'STARTED', 'FINISHING'].indexOf(coord.status) > -1) {
                 try {
                   runningTable.fnAddData([
                     emptyStringIfNull(coord.endTime),

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflows.mako

@@ -371,7 +371,7 @@ ${ layout.menubar(section='workflows', dashboard=True) }
                       '>${ _('Resume') }</a>';
             }
             if (foundRow == null) {
-              if (['RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED'].indexOf(wf.status) > -1) {
+              if (['RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED', 'STARTED', 'FINISHING'].indexOf(wf.status) > -1) {
                 try {
                   runningTable.fnAddData([
                     emptyStringIfNull(wf.lastModTime),

+ 1 - 1
apps/oozie/src/oozie/templates/utils.inc.mako

@@ -190,7 +190,7 @@
 <%def name="get_status(status)">
    % if status in ('SUCCEEDED', 'OK', 'NORMAL', 'DONE'):
      label-success
-   % elif status in ('RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED'):
+   % elif status in ('RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED', 'STARTED', 'FINISHING'):
       label-warning
    % elif status == 'READY':
       label-success