You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2013/10/16 23:46:13 UTC
git commit: Revert "AMBARI-3518. Reassign Master: Start services
marked successful with tasks timedout and aborted. (akovalenko)"
Updated Branches:
refs/heads/branch-1.4.1 ab998b096 -> 6875698f4
Revert "AMBARI-3518. Reassign Master: Start services marked successful with tasks timedout and aborted. (akovalenko)"
This reverts commit ab998b096ecd79e4c8bcc5f4b6f9178a2bd452dc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/6875698f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/6875698f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/6875698f
Branch: refs/heads/branch-1.4.1
Commit: 6875698f410052dda09b356663e23b311c1561eb
Parents: ab998b0
Author: Mahadev Konar <ma...@apache.org>
Authored: Wed Oct 16 14:46:53 2013 -0700
Committer: Mahadev Konar <ma...@apache.org>
Committed: Wed Oct 16 14:46:53 2013 -0700
----------------------------------------------------------------------
.../controllers/main/admin/highAvailability/progress_controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6875698f/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js
index 308b3a6..aaca72d 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js
@@ -363,7 +363,7 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle
this.setTaskLogs(currentTaskId, tasks);
if (!tasks.someProperty('Tasks.status', 'PENDING') && !tasks.someProperty('Tasks.status', 'QUEUED') && !tasks.someProperty('Tasks.status', 'IN_PROGRESS')) {
this.set('currentRequestIds', []);
- if (tasks.someProperty('Tasks.status', 'FAILED') || tasks.someProperty('Tasks.status', 'TIMEDOUT') || tasks.someProperty('Tasks.status', 'ABORTED')) {
+ if (tasks.someProperty('Tasks.status', 'FAILED') || tasks.someProperty('status', 'TIMEDOUT') || tasks.someProperty('status', 'ABORTED')) {
this.setTaskStatus(currentTaskId, 'FAILED');
} else {
this.setTaskStatus(currentTaskId, 'COMPLETED');