aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject aurora git commit: Fix query for active job updates when serving /updates.
Date Thu, 30 Apr 2015 20:01:01 GMT
Repository: aurora
Updated Branches:
  refs/heads/master f77daf73c -> 975318f90


Fix query for active job updates when serving /updates.

Bugs closed: AURORA-1231

Reviewed at https://reviews.apache.org/r/33728/


Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/975318f9
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/975318f9
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/975318f9

Branch: refs/heads/master
Commit: 975318f90c76b2f801eb91de0d8c30ec8c1e8a29
Parents: f77daf7
Author: Bill Farner <wfarner@apache.org>
Authored: Thu Apr 30 13:00:39 2015 -0700
Committer: Bill Farner <wfarner@apache.org>
Committed: Thu Apr 30 13:00:39 2015 -0700

----------------------------------------------------------------------
 .../resources/scheduler/assets/js/services.js   | 27 +++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/975318f9/src/main/resources/scheduler/assets/js/services.js
----------------------------------------------------------------------
diff --git a/src/main/resources/scheduler/assets/js/services.js b/src/main/resources/scheduler/assets/js/services.js
index 4782074..a514fa7 100644
--- a/src/main/resources/scheduler/assets/js/services.js
+++ b/src/main/resources/scheduler/assets/js/services.js
@@ -12,10 +12,20 @@
  * limitations under the License.
  */
 (function () {
-  /* global auroraUI:false, Identity:false, TaskQuery:false, ReadOnlySchedulerClient:false,
-            ACTIVE_STATES:false, CronCollisionPolicy: false, JobKey: false,
-            ScheduleStatus: false, JobUpdateQuery:false, JobUpdateAction:false,
-            JobUpdateStatus: false */
+  /* global
+    auroraUI:false,
+    ACTIVE_STATES:false,
+    ACTIVE_JOB_UPDATE_STATES: false,
+    CronCollisionPolicy: false,
+    Identity:false,
+    JobKey: false,
+    JobUpdateQuery:false,
+    JobUpdateAction:false,
+    JobUpdateStatus: false,
+    ReadOnlySchedulerClient:false,
+    ScheduleStatus: false,
+    TaskQuery:false
+  */
   'use strict';
 
   function makeJobTaskQuery(role, environment, jobName) {
@@ -246,13 +256,6 @@
         JobUpdateStatus.FAILED
       ];
 
-      var IN_PROGRESS_STATUSES = [
-        JobUpdateStatus.ROLLING_FORWARD,
-        JobUpdateStatus.ROLLING_BACK,
-        JobUpdateStatus.ROLL_FORWARD_PAUSED,
-        JobUpdateStatus.ROLL_BACK_PAUSED
-      ];
-
       var UPDATE_TERMINAL = toSet(UPDATE_TERMINAL_STATUSES);
 
       var INSTANCE_SUCCESSFUL = toSet([
@@ -302,7 +305,7 @@
           return updateUtil.getStatusQuery(UPDATE_TERMINAL_STATUSES);
         },
         getInProgressQuery: function () {
-          return updateUtil.getStatusQuery(IN_PROGRESS_STATUSES);
+          return updateUtil.getStatusQuery(ACTIVE_JOB_UPDATE_STATES);
         },
         instanceCountFromConfigs: function (instanceTaskConfigs) {
           var flattenedRanges = [];


Mime
View raw message