فهرست منبع

AMBARI-3220. NameNode HA Wizard: Initialize Metadata page changes needed since result of manual steps cannot be verified. (yusaku)

Yusaku Sako 12 سال پیش
والد
کامیت
344aa6417a

+ 2 - 1
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>' +

+ 3 - 1
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'));
     }
   }),
 

+ 1 - 1
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}} &rarr;</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>