Updated Branches: refs/heads/trunk d436c3a1b -> 335029f65
AMBARI-3471. NameNode HA wizard: On cluster without Hbase, on step "Finalize HA Setup" after page refresh we get js error (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/335029f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/335029f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/335029f6 Branch: refs/heads/trunk Commit: 335029f652cc20bbc5b285eab108c4af785ac3b8 Parents: d436c3a Author: Alex Antonenko <[email protected]> Authored: Mon Oct 7 19:07:03 2013 +0300 Committer: Alex Antonenko <[email protected]> Committed: Mon Oct 7 19:10:35 2013 +0300 ---------------------------------------------------------------------- .../admin/highAvailability/progress_controller.js | 17 ++++++++++------- .../admin/highAvailability/rollback_controller.js | 7 +++++++ 2 files changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/335029f6/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 32a074b..2f893d2 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js @@ -74,20 +74,23 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle }.property('tasks'), loadTasks: function () { + var self = this; var loadedStauses = this.get('content.tasksStatuses'); var loadedLogs = this.get('content.logs'); if (loadedStauses && loadedLogs && loadedStauses.length === this.get('tasks').length) { - for (var i = 0; i < loadedStauses.length; i++) { - this.setTaskStatus(i, loadedStauses[i]); - this.restoreTaskLog(i, loadedLogs[i]); - } + this.get('tasks').forEach(function(task,i){ + self.setTaskStatus(task.get('id'), loadedStauses[i]); + self.restoreTaskLog(task.get('id'), loadedLogs[i]); + }); if (loadedStauses.contains('IN_PROGRESS')) { + var curTaskId = this.get('tasks')[loadedStauses.indexOf('IN_PROGRESS')].get('id'); this.set('currentRequestIds', this.get('content.requestIds')); - this.set('currentTaskId', loadedStauses.indexOf('IN_PROGRESS')); + this.set('currentTaskId', curTaskId); this.doPolling(); }else if (loadedStauses.contains('QUEUED')){ - this.set('currentTaskId', loadedStauses.indexOf('QUEUED')); - this.runTask(loadedStauses.indexOf('QUEUED')); + var curTaskId = this.get('tasks')[loadedStauses.indexOf('QUEUED')].get('id'); + this.set('currentTaskId', curTaskId); + this.runTask(curTaskId); } } }, http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/335029f6/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js index 067756d..c87d6bb 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js @@ -161,6 +161,13 @@ App.HighAvailabilityRollbackController = App.HighAvailabilityProgressPageControl task.set('status', 'COMPLETED'); }, + retryTask: function () { + var task = this.get('tasks').findProperty('status', 'FAILED'); + task.set('showRetry', false); + task.set('showSkip', false); + task.set('status', 'PENDING'); + }, + onTaskCompleted: function () { var curTaskStatus = this.getTaskStatus(this.get('currentTaskId')); if (curTaskStatus != 'FAILED' && curTaskStatus != 'TIMEDOUT' && curTaskStatus != 'ABORTED') {
