incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject git commit: AMBARI-3287. NameNode HA Wizard: Tasks with statuses TIMEDOUT and ABORTED are treated as successful
Date Thu, 19 Sep 2013 15:25:07 GMT
Updated Branches:
  refs/heads/branch-1.4.1 7d857599e -> c1028003b


AMBARI-3287. NameNode HA Wizard: Tasks with statuses TIMEDOUT and ABORTED are treated as successful


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/c1028003
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/c1028003
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/c1028003

Branch: refs/heads/branch-1.4.1
Commit: c1028003b69e7875939ca991dc8034a341979f71
Parents: 7d85759
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Thu Sep 19 18:18:27 2013 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Thu Sep 19 18:18:27 2013 +0300

----------------------------------------------------------------------
 .../main/admin/highAvailability/progress_controller.js          | 5 +++--
 ambari-web/app/routes/main.js                                   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c1028003/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 aff94f0..d3aaa7c 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js
@@ -141,7 +141,8 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle
         this.set('status', 'COMPLETED');
         this.set('isSubmitDisabled', false);
       }
-    } else if (this.get('tasks').someProperty('status', 'FAILED') || this.get('tasks').someProperty('status',
'TIMEDOUT') || this.get('tasks').someProperty('status', 'ABORTED')) {
+    } else if (this.get('tasks').someProperty('status', 'FAILED')) {
+      console.warn('onTaskStatusChange4');
       this.set('status', 'FAILED');
       this.get('tasks').findProperty('status', 'FAILED').set('showRetry', true);
       this.get('tasks').findProperty('status', 'FAILED').set('showRollback', true);
@@ -286,7 +287,7 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle
       var currentTaskId = this.get('currentTaskId');
       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')) {
+        if (tasks.someProperty('Tasks.status', 'FAILED')  || tasks.someProperty('status',
'TIMEDOUT') || tasks.someProperty('status', 'ABORTED')) {
           this.setTaskStatus(currentTaskId, 'FAILED');
         } else {
           this.setTaskStatus(currentTaskId, 'COMPLETED');

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c1028003/ambari-web/app/routes/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index f299552..a978260 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -708,6 +708,7 @@ module.exports = Em.Route.extend({
               });
               this.hide();
               router.transitionTo('main.admin.adminHighAvailability');
+              location.reload();
             },
             didInsertElement: function () {
               this.fitHeight();


Mime
View raw message