AMBARI-956. On unavailability of non-master components, host with least number of master components should install all slave and client components. (Jaimin Jetly via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1406899 13f79535-47bb-0310-9956-ffa450edef68

AMBARI-666-CHANGES.txt

@@ -388,6 +388,10 @@ AMBARI-666 branch (unreleased changes)
   AMBARI-676. Seperate directory for ambari-server. (jitendra)
 
   IMPROVEMENTS
+
+  AMBARI-956. On unavailability of non-master components, host with least
+  number of master components should install all slave and client components. 
+  (Jaimin Jetly via yusaku)
  
   AMBARI-990. Refactor App Browser. (yusaku)
 

ambari-web/app/controllers/wizard/step5_controller.js

@@ -91,7 +91,7 @@ App.WizardStep5Controller = Em.Controller.extend({
         componentInfo.forEach(function (_componentInfo) {
           console.log("TRACE: master component name is: " + _componentInfo.display_name);
           var componentObj = {};
-          componentObj.component_name =  _componentInfo.component_name;
+          componentObj.component_name = _componentInfo.component_name;
           componentObj.display_name = _componentInfo.display_name;
           componentObj.selectedHost = this.selectHost(_componentInfo.component_name);   // call the method that plays selectNode algorithm or fetches from server
           componentObj.availableHosts = [];
@@ -103,7 +103,7 @@ App.WizardStep5Controller = Em.Controller.extend({
 
       masterHosts.forEach(function (_masterComponentHost) {
         var componentObj = {};
-        componentObj.component_name =  _masterComponentHost.component_name;
+        componentObj.component_name = _masterComponentHost.component;
         componentObj.display_name = _masterComponentHost.display_name;
         componentObj.selectedHost = _masterComponentHost.hostName;
         componentObj.availableHosts = [];
@@ -140,7 +140,7 @@ App.WizardStep5Controller = Em.Controller.extend({
         zookeeperComponent.set('zId', this.get('zId'));
         zookeeperComponent.set("showRemoveControl", true);
         zookeeperComponent.set("availableHosts", this.get("hosts").slice(0));
-        this.get("selectedServicesMasters").pushObject(Ember.Object.create(zookeeperComponent));
+        this.get("selectedServicesMasters").pushObject(zookeeperComponent);
 
       } else {
         componentObj = Ember.Object.create(item);

ambari-web/app/controllers/wizard/step6_controller.js

@@ -82,15 +82,15 @@ App.WizardStep6Controller = Em.Controller.extend({
    * Calculate this information on <code>content.services</code> variable
    * @return Boolean
    */
-	isMrSelected: function () {
+  isMrSelected: function () {
     return this.get('content.services').findProperty('serviceName', 'MAPREDUCE').get('isSelected');
-	}.property('content.services'),
+  }.property('content.services'),
 
   clearError: function () {
     if (this.get('isNoDataNodes') === false &&
-        (this.get('isNoTaskTrackers') === false || this.get('isMrSelected') === false) &&
-        (this.get('isNoRegionServers') === false || this.get('isHbSelected') === false) &&
-        this.get('isNoClients') === false) {
+      (this.get('isNoTaskTrackers') === false || this.get('isMrSelected') === false) &&
+      (this.get('isNoRegionServers') === false || this.get('isHbSelected') === false) &&
+      this.get('isNoClients') === false) {
       this.set('errorMessage', '');
     }
   }.observes('isNoDataNodes', 'isNoTaskTrackers', 'isNoRegionServers', 'isNoClients'),
@@ -168,6 +168,7 @@ App.WizardStep6Controller = Em.Controller.extend({
   renderSlaveHosts: function () {
     var hostsObj = Em.Set.create();
     var allHosts = this.getHostNames();
+    var maxNoofHostComponents = 9;
     var slaveHosts = this.get('content.slaveComponentHosts');
 
     allHosts.forEach(function (_hostName) {
@@ -182,20 +183,38 @@ App.WizardStep6Controller = Em.Controller.extend({
     });
 
     if (!slaveHosts) { // we are at this page for the first time
-
-      hostsObj.forEach(function (host) {
-        host.isMaster = this.hasMasterComponents(host.hostname);
-        host.isDataNode = host.isTaskTracker
+      if (allHosts.length > 3) {             //multiple nodes scenario
+        hostsObj.forEach(function (host) {
+          host.isMaster = this.hasMasterComponents(host.hostname);
+          host.isDataNode = host.isTaskTracker
             = host.isRegionServer = !host.isMaster;
-      }, this);
+        }, this);
+
+        if (hostsObj.someProperty('isDataNode', true)) {
+          hostsObj.findProperty('isDataNode', true).set('isClient', true);
+        }
+      } else {
+        var masterObj = {
+          host: null,
+          masterComponents: maxNoofHostComponents
+        };
+        hostsObj.forEach(function (host) {
+          host.isMaster = this.hasMasterComponents(host.hostname);
+          if (this.getMasterComponentsForHost(host.hostname).length <= masterObj.masterComponents) {
+            masterObj.masterComponents = this.getMasterComponentsForHost(host.hostname).length;
+            masterObj.host = host;
+          }
+        }, this);
+        masterObj.host.set('isClient', true);
+        masterObj.host.set('isDataNode', true);
+        masterObj.host.set('isTaskTracker', true);
+        masterObj.host.set('isRegionServer', true);
 
-      if (hostsObj.someProperty('isDataNode', true)) {
-        hostsObj.findProperty('isDataNode', true).set('isClient', true);
       }
 
     } else {
 
-			var dataNodes = slaveHosts.findProperty('componentName', 'DATANODE');
+      var dataNodes = slaveHosts.findProperty('componentName', 'DATANODE');
       dataNodes.hosts.forEach(function (_dataNode) {
         var dataNode = hostsObj.findProperty('hostname', _dataNode.hostname);
         if (dataNode) {
@@ -203,7 +222,7 @@ App.WizardStep6Controller = Em.Controller.extend({
         }
       });
 
-      if(this.get('isMrSelected')) {
+      if (this.get('isMrSelected')) {
         var taskTrackers = slaveHosts.findProperty('componentName', 'TASKTRACKER');
         taskTrackers.hosts.forEach(function (_taskTracker) {
           var taskTracker = hostsObj.findProperty('hostname', _taskTracker.hostname);
@@ -214,7 +233,7 @@ App.WizardStep6Controller = Em.Controller.extend({
       }
 
       if (this.get('isHbSelected')) {
-				var regionServers = slaveHosts.findProperty('componentName', 'HBASE_REGIONSERVER');
+        var regionServers = slaveHosts.findProperty('componentName', 'HBASE_REGIONSERVER');
         regionServers.hosts.forEach(function (_regionServer) {
           var regionServer = hostsObj.findProperty('hostname', _regionServer.hostname);
           if (regionServer) {
@@ -240,7 +259,7 @@ App.WizardStep6Controller = Em.Controller.extend({
 
     }
 
-    hostsObj.forEach(function(host){
+    hostsObj.forEach(function (host) {
       this.get('hosts').pushObject(host);
     }, this);
   },
@@ -252,7 +271,7 @@ App.WizardStep6Controller = Em.Controller.extend({
    */
   getMasterComponentsForHost: function (hostname) {
     var hostInfo = this.get('content.hostToMasterComponent').findProperty('hostname', hostname);
-    if(hostInfo){
+    if (hostInfo) {
       return hostInfo.components;
     }
 
@@ -265,11 +284,11 @@ App.WizardStep6Controller = Em.Controller.extend({
    * @return {Boolean}
    */
   validate: function () {
-    var isError =  this.get('isNoDataNodes') || this.get('isNoClients')
+    var isError = this.get('isNoDataNodes') || this.get('isNoClients')
       || ( this.get('isMrSelected') && this.get('isNoTaskTrackers'))
-      || ( this.get('isHbSelected') &&this.get('isNoRegionServers'));
+      || ( this.get('isHbSelected') && this.get('isNoRegionServers'));
 
-    if(isError){
+    if (isError) {
       this.set('errorMessage', Ember.I18n.t('installer.step6.error.mustSelectOne'));
     }
     return !isError;