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 9ccad63 AMBARI-23729. Start Namenodes takes a very long time when adding a namespace (akovalenko) 9ccad63 is described below commit 9ccad6359549f03f9e2f4e0b1ca244aaac88e3f6 Author: Aleksandr Kovalenko <akovale...@apache.org> AuthorDate: Mon Apr 30 17:43:28 2018 +0300 AMBARI-23729. Start Namenodes takes a very long time when adding a namespace (akovalenko) --- .../main/admin/federation/step1_controller.js | 2 +- .../main/admin/federation/step4_controller.js | 25 +++++++++++++++++++++- ambari-web/app/messages.js | 20 +++++++++-------- 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/ambari-web/app/controllers/main/admin/federation/step1_controller.js b/ambari-web/app/controllers/main/admin/federation/step1_controller.js index e7730a4..63b9ca8 100644 --- a/ambari-web/app/controllers/main/admin/federation/step1_controller.js +++ b/ambari-web/app/controllers/main/admin/federation/step1_controller.js @@ -37,7 +37,7 @@ App.NameNodeFederationWizardStep1Controller = Em.Controller.extend({ }.property('content.nameServiceId', 'existingNameServices.length'), next: function () { - if (this.get('isNameServiceIdValid')) { + if (!this.get('isNameServiceIdError')) { App.router.send('next'); } } diff --git a/ambari-web/app/controllers/main/admin/federation/step4_controller.js b/ambari-web/app/controllers/main/admin/federation/step4_controller.js index b1606f3..7bc3a0a 100644 --- a/ambari-web/app/controllers/main/admin/federation/step4_controller.js +++ b/ambari-web/app/controllers/main/admin/federation/step4_controller.js @@ -22,10 +22,25 @@ App.NameNodeFederationWizardStep4Controller = App.HighAvailabilityProgressPageCo name: "nameNodeFederationWizardStep4Controller", - commands: ['stopRequiredServices', 'reconfigureServices', 'installNameNode', 'installZKFC', 'startJournalNodes', 'startNameNodes', 'formatNameNode', 'formatZKFC', 'startZKFC', 'startNameNode', 'bootstrapNameNode', 'startZKFC2', 'startNameNode2', 'restartAllServices'], + commands: ['stopRequiredServices', 'reconfigureServices', 'installNameNode', 'installZKFC', 'startJournalNodes', 'startInfraSolr', 'startRanger', 'startNameNodes', 'formatNameNode', 'formatZKFC', 'startZKFC', 'startNameNode', 'bootstrapNameNode', 'startZKFC2', 'startNameNode2', 'restartAllServices'], tasksMessagesPrefix: 'admin.nameNodeFederation.wizard.step', + initializeTasks: function () { + this._super(); + this.removeUnneededTasks(); + }, + + removeUnneededTasks: function () { + var installedServices = App.Service.find().mapProperty('serviceName'); + if (!installedServices.contains('RANGER')) { + this.removeTasks(['startInfraSolr', 'startRanger']); + } + if (!installedServices.contains('AMBARI_INFRA_SOLR')) { + this.removeTasks(['startInfraSolr']); + } + }, + newNameNodeHosts: function () { return this.get('content.masterComponentHosts').filterProperty('component', 'NAMENODE').filterProperty('isInstalled', false).mapProperty('hostName'); }.property('content.masterComponentHosts.@each.hostName'), @@ -114,6 +129,14 @@ App.NameNodeFederationWizardStep4Controller = App.HighAvailabilityProgressPageCo this.updateComponent('ZKFC', this.get('newNameNodeHosts')[0], "HDFS", "Start"); }, + startInfraSolr: function () { + this.startServices(false, ['AMBARI_INFRA_SOLR'], true); + }, + + startRanger: function () { + this.startServices(false, ['RANGER'], true); + }, + startNameNode: function () { this.updateComponent('NAMENODE', this.get('newNameNodeHosts')[0], "HDFS", "Start"); }, diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 899504c..3849fac 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1692,15 +1692,17 @@ Em.I18n.translations = { 'admin.nameNodeFederation.wizard.step4.task2.title': 'Install Additional NameNodes', 'admin.nameNodeFederation.wizard.step4.task3.title': 'Install Additional ZKFCs', 'admin.nameNodeFederation.wizard.step4.task4.title': 'Start JournalNodes', - 'admin.nameNodeFederation.wizard.step4.task5.title': 'Start NameNodes', - 'admin.nameNodeFederation.wizard.step4.task6.title': 'Format NameNode', - 'admin.nameNodeFederation.wizard.step4.task7.title': 'Format ZKFC', - 'admin.nameNodeFederation.wizard.step4.task8.title': 'Start ZKFC', - 'admin.nameNodeFederation.wizard.step4.task9.title': 'Start NameNode', - 'admin.nameNodeFederation.wizard.step4.task10.title': 'Bootstrap NameNode', - 'admin.nameNodeFederation.wizard.step4.task11.title': 'Start ZKFC', - 'admin.nameNodeFederation.wizard.step4.task12.title': 'Start NameNode', - 'admin.nameNodeFederation.wizard.step4.task13.title': 'Restart Required Services', + 'admin.nameNodeFederation.wizard.step4.task5.title': 'Start Infra Solr', + 'admin.nameNodeFederation.wizard.step4.task6.title': 'Start Ranger', + 'admin.nameNodeFederation.wizard.step4.task7.title': 'Start NameNodes', + 'admin.nameNodeFederation.wizard.step4.task8.title': 'Format NameNode', + 'admin.nameNodeFederation.wizard.step4.task9.title': 'Format ZKFC', + 'admin.nameNodeFederation.wizard.step4.task10.title': 'Start ZKFC', + 'admin.nameNodeFederation.wizard.step4.task11.title': 'Start NameNode', + 'admin.nameNodeFederation.wizard.step4.task12.title': 'Bootstrap NameNode', + 'admin.nameNodeFederation.wizard.step4.task13.title': 'Start ZKFC', + 'admin.nameNodeFederation.wizard.step4.task14.title': 'Start NameNode', + 'admin.nameNodeFederation.wizard.step4.task15.title': 'Restart Required Services', 'admin.security.title':'Kerberos security has not been enabled', 'admin.security.enabled': 'Kerberos security is enabled', -- To stop receiving notification emails like this one, please contact akovale...@apache.org.