Updated Branches: refs/heads/trunk 2df4a6e09 -> 344aa6417
AMBARI-3220. NameNode HA Wizard: Initialize Metadata page changes needed since result of manual steps cannot be verified. (yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/344aa641 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/344aa641 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/344aa641 Branch: refs/heads/trunk Commit: 344aa6417a40b842c498253c1569e2cc17e13400 Parents: becdc59 Author: Yusaku Sako <[email protected]> Authored: Thu Sep 12 17:59:34 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Thu Sep 12 18:10:11 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/messages.js | 3 ++- ambari-web/app/routes/high_availability_routes.js | 4 +++- ambari-web/app/templates/main/admin/highAvailability/step8.hbs | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/344aa641/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index e264d9a..9173f06 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -705,6 +705,7 @@ Em.I18n.translations = { 'admin.highAvailability.wizard.step6.jsNoInit':'JournalNodes not initialized yet', 'admin.highAvailability.wizard.step6.jsInit':'JournalNodes initialized', 'admin.highAvailability.wizard.step8.metaNoInit':'Metadata not initialized yet', + 'admin.highAvailability.wizard.step8.confirmPopup.body':'Please confirm that you have run the manual steps before continuing.', 'admin.highAvailability.rollback.header':'Disable NameNode HA Wizard', 'admin.highAvailability.rollback.task0.title':'Stop all services', @@ -729,7 +730,7 @@ Em.I18n.translations = { '<li>Login to the NameNode host <b>{1}</b> as user <b>{0}</b>.</li>' + '<li>Initialize the metadata for NameNode automatic failover by running:' + '<div class="code-snippet">hdfs zkfc -formatZK</div></li>' + - '<li>You will be able to proceed once Ambari detects that the steps were completed successfully.</li>' + + '<li>Please proceed once you have completed the steps above.</li>' + '</ol>', 'admin.highAvailability.wizard.step6.body': '<ol>' + http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/344aa641/ambari-web/app/routes/high_availability_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/high_availability_routes.js b/ambari-web/app/routes/high_availability_routes.js index f0dea7a..0c9065a 100644 --- a/ambari-web/app/routes/high_availability_routes.js +++ b/ambari-web/app/routes/high_availability_routes.js @@ -223,7 +223,9 @@ module.exports = Em.Route.extend({ return false; }, next: function (router) { - router.transitionTo('step9'); + App.showConfirmationPopup(function() { + router.transitionTo('step9'); + }, Em.I18n.t('admin.highAvailability.wizard.step8.confirmPopup.body')); } }), http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/344aa641/ambari-web/app/templates/main/admin/highAvailability/step8.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/highAvailability/step8.hbs b/ambari-web/app/templates/main/admin/highAvailability/step8.hbs index ba6bbf9..5a16406 100644 --- a/ambari-web/app/templates/main/admin/highAvailability/step8.hbs +++ b/ambari-web/app/templates/main/admin/highAvailability/step8.hbs @@ -22,6 +22,6 @@ </div> <div class="btn-area"> <a class="btn btn-success pull-right" {{action next}}>{{t common.next}} →</a> - <span class="pull-right btn-extra-info">{{t admin.highAvailability.wizard.step8.metaNoInit}}</span> + <span class="pull-right btn-extra-info">{{!t admin.highAvailability.wizard.step8.metaNoInit}}</span> </div> </div>
