Эх сурвалжийг харах

HUE-8559 [jb] Hue shows incorrect color for failed oozie jobs

jdesjean 7 жил өмнө
parent
commit
6c50f29a12

+ 3 - 3
apps/jobbrowser/src/jobbrowser/apis/job_api.py

@@ -148,7 +148,7 @@ class YarnApi(Api):
         'name': app['name'],
         'type': app['applicationType'],
         'status': app['status'],
-        'apiStatus': self._api_status(app['status'], app['applicationType']),
+        'apiStatus': self._api_status(app['status']),
         'user': app['user'],
         'progress': app['progress'],
         'duration': app['durationMs'],
@@ -259,10 +259,10 @@ class YarnApi(Api):
         }
     return {}
 
-  def _api_status(self, status, app_type=None):
+  def _api_status(self, status):
     if status in ['NEW', 'NEW_SAVING', 'SUBMITTED', 'ACCEPTED', 'RUNNING']:
       return 'RUNNING'
-    elif status == 'SUCCEEDED' or (app_type == 'Oozie Launcher' and status == 'FINISHED'):
+    elif status == 'SUCCEEDED':
       return 'SUCCEEDED'
     else:
       return 'FAILED' # FAILED, KILLED

+ 4 - 1
apps/jobbrowser/src/jobbrowser/yarn_models.py

@@ -351,7 +351,10 @@ class OozieYarnJob(Job):
   def _fixup(self):
     jobid = self.id
 
-    setattr(self, 'status', self.state)
+    if self.state in ('FINISHED', 'FAILED', 'KILLED'):
+      setattr(self, 'status', self.finalStatus)
+    else:
+      setattr(self, 'status', self.state)
     setattr(self, 'jobName', self.name)
     setattr(self, 'jobId', jobid)
     setattr(self, 'jobId_short', self.jobId.replace('job_', ''))