You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2018/04/16 10:05:44 UTC

[ambari] branch trunk updated: AMBARI-23576. Modify federation wizard steps to Stop All services and Start ZK and JN (akovalenko)

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 9f5a8e8  AMBARI-23576. Modify federation wizard steps to Stop All services and Start ZK and JN (akovalenko)
9f5a8e8 is described below

commit 9f5a8e888b8e06b93730bb630d1f36e7eb275804
Author: Aleksandr Kovalenko <ak...@apache.org>
AuthorDate: Fri Apr 13 18:16:57 2018 +0300

    AMBARI-23576. Modify federation wizard steps to Stop All services and Start ZK and JN (akovalenko)
---
 .../main/admin/federation/step4_controller.js      | 36 +++++-----------------
 ambari-web/app/messages.js                         | 27 ++++++++--------
 2 files changed, 22 insertions(+), 41 deletions(-)

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 ff609f7..3105449 100644
--- a/ambari-web/app/controllers/main/admin/federation/step4_controller.js
+++ b/ambari-web/app/controllers/main/admin/federation/step4_controller.js
@@ -22,7 +22,7 @@ App.NameNodeFederationWizardStep4Controller = App.HighAvailabilityProgressPageCo
 
   name: "nameNodeFederationWizardStep4Controller",
 
-  commands: ['reconfigureServices', 'installNameNode', 'installZKFC', 'restartJournalNodes', 'formatNameNode', 'formatZKFC', 'startZKFC', 'startNameNode', 'bootstrapNameNode', 'createWidgets', 'startZKFC2', 'startNameNode2', 'restartAllServices'],
+  commands: ['stopRequiredServices', 'reconfigureServices', 'installNameNode', 'installZKFC', 'startJournalNodes', 'formatNameNode', 'formatZKFC', 'startZKFC', 'startNameNode', 'bootstrapNameNode', 'createWidgets', 'startZKFC2', 'startNameNode2', 'restartAllServices'],
 
   tasksMessagesPrefix: 'admin.nameNodeFederation.wizard.step',
 
@@ -30,6 +30,10 @@ App.NameNodeFederationWizardStep4Controller = App.HighAvailabilityProgressPageCo
     return this.get('content.masterComponentHosts').filterProperty('component', 'NAMENODE').filterProperty('isInstalled', false).mapProperty('hostName');
   }.property('content.masterComponentHosts.@each.hostName'),
 
+  stopRequiredServices: function () {
+    this.stopServices(["ZOOKEEPER"]);
+  },
+
   reconfigureServices: function () {
     var configs = [];
     var data = this.get('content.serviceConfigProperties');
@@ -72,33 +76,9 @@ App.NameNodeFederationWizardStep4Controller = App.HighAvailabilityProgressPageCo
     this.createInstallComponentTask('ZKFC', this.get('newNameNodeHosts'), "HDFS");
   },
 
-  restartJournalNodes: function () {
-    var context = "Restart JournalNodes";
-
-    var resource_filters = {
-      component_name: "JOURNALNODE",
-      hosts: App.HostComponent.find().filterProperty('componentName', 'JOURNALNODE').mapProperty('hostName').join(','),
-      service_name: "HDFS"
-    };
-
-    var operation_level = {
-      level: "HOST_COMPONENT",
-      cluster_name: this.get('content.cluster.name'),
-      service_name: "HDFS",
-      hostcomponent_name: "JOURNALNODE"
-    };
-
-    App.ajax.send({
-      name: 'restart.hostComponents',
-      sender: this,
-      data: {
-        context: context,
-        resource_filters: [resource_filters],
-        operation_level: operation_level
-      },
-      success: 'startPolling',
-      error: 'onTaskError'
-    });
+  startJournalNodes: function () {
+    var hostNames = App.HostComponent.find().filterProperty('componentName', 'JOURNALNODE').mapProperty('hostName');
+    this.updateComponent('JOURNALNODE', hostNames, "HDFS", "Start");
   },
 
   formatNameNode: function () {
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index fbd7dd0..2c533d4 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1689,19 +1689,20 @@ Em.I18n.translations = {
   '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.task0.title': 'Reconfigure Services',
-  'admin.nameNodeFederation.wizard.step4.task1.title': 'Install Additional NameNodes',
-  'admin.nameNodeFederation.wizard.step4.task2.title': 'Install Additional ZKFCs',
-  'admin.nameNodeFederation.wizard.step4.task3.title': 'Restart JournalNodes',
-  'admin.nameNodeFederation.wizard.step4.task4.title': 'Format NameNode',
-  'admin.nameNodeFederation.wizard.step4.task5.title': 'Format ZKFC',
-  'admin.nameNodeFederation.wizard.step4.task6.title': 'Start ZKFC',
-  'admin.nameNodeFederation.wizard.step4.task7.title': 'Start NameNode',
-  'admin.nameNodeFederation.wizard.step4.task8.title': 'Bootstrap NameNode',
-  'admin.nameNodeFederation.wizard.step4.task9.title': 'Create widgets',
-  'admin.nameNodeFederation.wizard.step4.task10.title': 'Start ZKFC',
-  'admin.nameNodeFederation.wizard.step4.task11.title': 'Start NameNode',
-  'admin.nameNodeFederation.wizard.step4.task12.title': 'Restart Required Services',
+  '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',
+  'admin.nameNodeFederation.wizard.step4.task3.title': 'Install Additional ZKFCs',
+  'admin.nameNodeFederation.wizard.step4.task4.title': 'Start JournalNodes',
+  'admin.nameNodeFederation.wizard.step4.task5.title': 'Format NameNode',
+  'admin.nameNodeFederation.wizard.step4.task6.title': 'Format ZKFC',
+  'admin.nameNodeFederation.wizard.step4.task7.title': 'Start ZKFC',
+  'admin.nameNodeFederation.wizard.step4.task8.title': 'Start NameNode',
+  'admin.nameNodeFederation.wizard.step4.task9.title': 'Bootstrap NameNode',
+  'admin.nameNodeFederation.wizard.step4.task10.title': 'Create widgets',
+  '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.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
akovalenko@apache.org.