Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4D2B8181E8 for ; Thu, 30 Apr 2015 20:01:02 +0000 (UTC) Received: (qmail 38810 invoked by uid 500); 30 Apr 2015 20:01:02 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 38777 invoked by uid 500); 30 Apr 2015 20:01:02 -0000 Mailing-List: contact commits-help@aurora.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.apache.org Delivered-To: mailing list commits@aurora.apache.org Received: (qmail 38768 invoked by uid 99); 30 Apr 2015 20:01:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 20:01:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3AC8E0061; Thu, 30 Apr 2015 20:01:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wfarner@apache.org To: commits@aurora.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: aurora git commit: Fix query for active job updates when serving /updates. Date: Thu, 30 Apr 2015 20:01:01 +0000 (UTC) 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 Authored: Thu Apr 30 13:00:39 2015 -0700 Committer: Bill Farner 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 = [];