Updated Branches: refs/heads/trunk 098f5f2d9 -> 8d3f64661
AMBARI-3184. NameNode HA wizard (rollback): When task fails in rollback popup, rollback button is shown Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/9b240c97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/9b240c97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/9b240c97 Branch: refs/heads/trunk Commit: 9b240c97a77f00f78a4c97744c853ab2f2a21923 Parents: 55add73 Author: Alex Antonenko <[email protected]> Authored: Wed Sep 11 19:42:52 2013 +0300 Committer: Alex Antonenko <[email protected]> Committed: Wed Sep 11 19:42:52 2013 +0300 ---------------------------------------------------------------------- .../main/admin/highAvailability/progress_controller.js | 3 +++ .../main/admin/highAvailability/rollback_controller.js | 1 + .../controllers/main/admin/highAvailability/step6_controller.js | 2 +- ambari-web/app/mappers/service_mapper.js | 2 +- ambari-web/app/templates/main/admin/highAvailability/progress.hbs | 2 ++ 5 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9b240c97/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 b564e74..03f3826 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js @@ -53,6 +53,7 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle id: i, command: commands[i], showRetry: false, + showRollback: false, name: Em.I18n.t('admin.highAvailability.wizard.step' + currentStep + '.task' + i + '.title'), displayName: Em.I18n.t('admin.highAvailability.wizard.step' + currentStep + '.task' + i + '.title'), progress: 0, @@ -104,6 +105,7 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle retryTask: function () { var task = this.get('tasks').findProperty('status', 'FAILED'); task.set('showRetry', false); + task.set('showRollback', false); task.set('status', 'PENDING'); }, @@ -141,6 +143,7 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle } else if (this.get('tasks').someProperty('status', 'FAILED') || this.get('tasks').someProperty('status', 'TIMEDOUT') || this.get('tasks').someProperty('status', 'ABORTED')) { this.set('status', 'FAILED'); this.get('tasks').findProperty('status', 'FAILED').set('showRetry', true); + this.get('tasks').findProperty('status', 'FAILED').set('showRollback', true); } var statuses = this.get('tasks').mapProperty('status'); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9b240c97/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 feebdc1..144b38f 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/rollback_controller.js @@ -106,6 +106,7 @@ App.HighAvailabilityRollbackController = App.HighAvailabilityProgressPageControl id: i, command: commands[i], showRetry: false, + showRollback: false, name: Em.I18n.t('admin.highAvailability.rollback.task' + i + '.title'), displayName: Em.I18n.t('admin.highAvailability.rollback.task' + i + '.title'), progress: 0, http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9b240c97/ambari-web/app/controllers/main/admin/highAvailability/step6_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step6_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step6_controller.js index 14cef8c..9870dbe 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/step6_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/step6_controller.js @@ -53,7 +53,7 @@ App.HighAvailabilityWizardStep6Controller = Em.Controller.extend({ checkJnCheckPointStatus: function (data) { var self = this; var journalStatusInfo; - if (data.metrics) { + if (data.metrics && data.metrics.dfs) { journalStatusInfo = $.parseJSON(data.metrics.dfs.journalnode.journalsStatus); if (journalStatusInfo[this.get('content.nameServiceId')] && journalStatusInfo[this.get('content.nameServiceId')].Formatted === "true") { this.set("initJnCounter", (this.get('initJnCounter') + 1)); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9b240c97/ambari-web/app/mappers/service_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/service_mapper.js b/ambari-web/app/mappers/service_mapper.js index 509fa99..118faaa 100644 --- a/ambari-web/app/mappers/service_mapper.js +++ b/ambari-web/app/mappers/service_mapper.js @@ -336,7 +336,7 @@ App.servicesMapper = App.QuickDataMapper.create({ // make active nameNode as host_components[0]. if ( component.host_components.length == 2) { //enabled HA var haState2; - if (component.host_components[1].metrics.dfs) { + if (component.host_components[1].metrics && component.host_components[1].metrics.dfs) { haState2 = component.host_components[1].metrics.dfs.FSNamesystem.HAState; } if (haState2 == "active") { // change places http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/9b240c97/ambari-web/app/templates/main/admin/highAvailability/progress.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/highAvailability/progress.hbs b/ambari-web/app/templates/main/admin/highAvailability/progress.hbs index c467b4a..3a9d9f9 100644 --- a/ambari-web/app/templates/main/admin/highAvailability/progress.hbs +++ b/ambari-web/app/templates/main/admin/highAvailability/progress.hbs @@ -40,6 +40,8 @@ <i class="icon-repeat icon-white"></i> {{t common.retry}} </a> + {{/if}} + {{#if task.showRollback}} <a {{action rollback target="controller"}} class="btn btn-primary retry"> <i class="icon-repeat icon-white"></i> {{t common.rollBack}}
