This is an automated email from the ASF dual-hosted git repository.
akovalenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 54b3106 AMBARI-23588. NN Federation Wizard Changes (akovalenko)
54b3106 is described below
commit 54b3106d0b30e97c7c12c592f428be0ac7e7928a
Author: Aleksandr Kovalenko <[email protected]>
AuthorDate: Mon Apr 16 18:44:05 2018 +0300
AMBARI-23588. NN Federation Wizard Changes (akovalenko)
---
ambari-web/app/messages.js | 9 +++++----
ambari-web/app/routes/namenode_federation_routes.js | 10 +++-------
ambari-web/app/templates/main/admin/federation/step1.hbs | 2 +-
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 2c533d4..b827d45 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1672,10 +1672,11 @@ Em.I18n.translations = {
'admin.nameNodeFederation.wizard.required.zookeepers': 'All ZooKeeper
Servers should be up',
'admin.nameNodeFederation.wizard.required.journalnodes': 'All JournalNodes
should be up',
'admin.nameNodeFederation.wizard.header': 'Add New HDFS Namespace',
- 'admin.nameNodeFederation.closePopup': 'Add New HDFS Namespace Wizard is in
progress. You must allow the wizard to complete for Ambari to be in usable
state. If you choose to quit, you must follow manual instructions to complete
or revert Add New HDFS Namespace as documented in the Ambari User Guide. Are
you sure you want to exit the wizard?',
+ 'admin.nameNodeFederation.closePopup': 'Are you sure you want to quit?',
+ 'admin.nameNodeFederation.closePopup2': 'Add New HDFS Namespace Wizard is in
progress. You must allow the wizard to complete for Ambari to be in usable
state. If you choose to quit, you must follow manual instructions to complete
or revert Add New HDFS Namespace as documented in the Ambari User Guide. Are
you sure you want to exit the wizard?',
'admin.nameNodeFederation.wizard.step1.header': 'Get Started',
'admin.nameNodeFederation.wizard.step1.body':'This wizard will walk you
through the process of setting up a new Highly Available NameNode pair that
will be used to create a new HDFS namespace, allowing you to use Ambari to
manage multiple HDFS namespaces and take advantage of HDFS Federation.',
- 'admin.nameNodeFederation.wizard.step1.alert':'If you have HBase running,
please exit this wizard and stop HBase first.',
+ 'admin.nameNodeFederation.wizard.step1.alert':'You should plan a cluster
maintenance window and prepare for cluster downtime when adding a new HDFS
Namespace as this Wizard will restart all services.',
'admin.nameNodeFederation.wizard.step1.nameserviceid':'New Nameservice ID',
'admin.nameNodeFederation.wizard.step1.nameserviceid.existing':'Existing
Nameservice ID',
'admin.nameNodeFederation.wizard.step1.nameserviceid.error':'Must consist of
letters, numbers, and hyphens. Cannot begin or end with a hyphen.',
@@ -1687,8 +1688,8 @@ Em.I18n.translations = {
'</div>',
'admin.nameNodeFederation.wizard.step4.header': 'Configure Components',
'admin.nameNodeFederation.wizard,step4.save.configuration.note':'This
configuration is created by Enable NameNode Federation wizard',
- 'admin.nameNodeFederation.wizard.step4.notice.inProgress':'Please wait while
NameNode Federation Wizard is being deployed.',
- 'admin.nameNodeFederation.wizard.step4.notice.completed':'NameNode
Federation Wizard has been enabled successfully.',
+ 'admin.nameNodeFederation.wizard.step4.notice.inProgress':'Please wait while
your new HDFS Namespace is being deployed.',
+ 'admin.nameNodeFederation.wizard.step4.notice.completed':'Add New HDFS
Namespace Wizard has been completed successfully.',
'admin.nameNodeFederation.wizard.step4.task0.title': 'Stop Required
Services',
'admin.nameNodeFederation.wizard.step4.task1.title': 'Reconfigure Services',
'admin.nameNodeFederation.wizard.step4.task2.title': 'Install Additional
NameNodes',
diff --git a/ambari-web/app/routes/namenode_federation_routes.js
b/ambari-web/app/routes/namenode_federation_routes.js
index 732015b..0663c8e 100644
--- a/ambari-web/app/routes/namenode_federation_routes.js
+++ b/ambari-web/app/routes/namenode_federation_routes.js
@@ -44,14 +44,10 @@ module.exports = App.WizardRoute.extend({
onClose: function () {
var nameNodeFederationWizardController =
router.get('nameNodeFederationWizardController'),
- currStep = nameNodeFederationWizardController.get('currentStep');
- if (parseInt(currStep) === 4) {
- App.showConfirmationPopup(function () {
-
nameNodeFederationWizardController.resetOnClose(nameNodeFederationWizardController,
'main.services.index');
- }, Em.I18n.t('admin.nameNodeFederation.closePopup'));
- } else {
+ currStep = nameNodeFederationWizardController.get('currentStep');
+ App.showConfirmationPopup(function () {
nameNodeFederationWizardController.resetOnClose(nameNodeFederationWizardController,
'main.services.index');
- }
+ }, Em.I18n.t(parseInt(currStep) === 4 ?
'admin.nameNodeFederation.closePopup2' :
'admin.nameNodeFederation.closePopup'));
},
didInsertElement: function () {
this._super();
diff --git a/ambari-web/app/templates/main/admin/federation/step1.hbs
b/ambari-web/app/templates/main/admin/federation/step1.hbs
index 41324b3..e6b9d08 100644
--- a/ambari-web/app/templates/main/admin/federation/step1.hbs
+++ b/ambari-web/app/templates/main/admin/federation/step1.hbs
@@ -19,7 +19,7 @@
<h4 class="step-title">{{t
admin.nameNodeFederation.wizard.step1.header}}</h4>
<div class="step-description">
<p>{{t admin.nameNodeFederation.wizard.step1.body}}</p>
- <div class="alert alert-warning">
+ <div class="alert alert-danger">
{{t admin.nameNodeFederation.wizard.step1.alert}}
</div>
</div>
--
To stop receiving notification emails like this one, please contact
[email protected].
