浏览代码

HUE-3017 [oozie] Coordinator dashboard does not show jobs with certain statuses

krish 10 年之前
父节点
当前提交
410d9e1

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

@@ -366,7 +366,7 @@ ${layout.menubar(section='coordinators', dashboard=True)}
     }
 
     function getStatuses(type) {
-      var selectedStatuses = (type == 'running') ? ['RUNNING', 'PREP', 'SUSPENDED'] : ['SUCCEEDED', 'KILLED', 'FAILED'];
+      var selectedStatuses = (type == 'running') ? ['RUNNING', 'PREP', 'SUSPENDED', 'RUNNINGWITHERROR', 'PREPSUSPENDED', 'SUSPENDEDWITHERROR', 'PREPPAUSED', 'PAUSED', 'PAUSEDWITHERROR'] : ['SUCCEEDED', 'KILLED', 'FAILED', 'DONEWITHERROR'];
       var btnStatuses = [];
 
       var statusBtns = $("a.btn-status.active");
@@ -375,9 +375,9 @@ ${layout.menubar(section='coordinators', dashboard=True)}
         if (val == 'SUCCEEDED') {
           btnStatuses = btnStatuses.concat(['SUCCEEDED']);
         } else if (val == 'RUNNING') {
-          btnStatuses = btnStatuses.concat(['RUNNING', 'PREP', 'SUSPENDED']);
+          btnStatuses = btnStatuses.concat(['RUNNING', 'PREP', 'SUSPENDED', 'RUNNINGWITHERROR', 'PREPSUSPENDED', 'SUSPENDEDWITHERROR', 'PREPPAUSED', 'PAUSED', 'PAUSEDWITHERROR']);
         } else if (val == 'ERROR') {
-          btnStatuses = btnStatuses.concat(['KILLED', 'FAILED']);
+          btnStatuses = btnStatuses.concat(['KILLED', 'FAILED', 'DONEWITHERROR']);
         }
       });
 

+ 4 - 5
apps/oozie/src/oozie/tests.py

@@ -3402,15 +3402,14 @@ class TestDashboard(OozieMockBase):
     assert_true('Running' in response.content, response.content)
     assert_true('Completed' in response.content, response.content)
 
-    response = self.c.get(reverse('oozie:list_oozie_coordinators') + "?format=json&status=SUCCEEDED")
-    for coord_id in MockOozieApi.COORDINATOR_IDS:
-      assert_true(coord_id in response.content, response.content)
+    response = self.c.get(reverse('oozie:list_oozie_coordinators') + "?format=json")
+    assert_true(len(json.loads(response.content)['jobs']) == 0)
 
-    response = self.c.get(reverse('oozie:list_oozie_coordinators') + "?format=json&status=SUCCEEDED")
+    response = self.c.get(reverse('oozie:list_oozie_coordinators') + "?format=json&status=RUNNING&status=PREP&status=SUSPENDED")
     for coord_id in MockOozieApi.COORDINATOR_IDS:
       assert_true(coord_id in response.content, response.content)
 
-    response = self.c.get(reverse('oozie:list_oozie_coordinators') + "?format=json&status=SUCCEEDED")
+    response = self.c.get(reverse('oozie:list_oozie_coordinators') + "?format=json&status=KILLED&status=FAILED&status=DONEWITHERROR")
     for coord_id in MockOozieApi.COORDINATOR_IDS:
       assert_true(coord_id in response.content, response.content)