AMBARI-4353. Storm: Change Supervisor component category from "Client" to "Slave". (Denys Buzhor via akovalenko)

ambari-web/app/controllers/main/service/info/configs.js

@@ -1717,9 +1717,36 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
         hiveMetastoreHost.defaultValue = App.Service.find('HIVE').get('hostComponents').findProperty('componentName', 'HIVE_SERVER').get('host.hostName');
         globalConfigs.push(hiveMetastoreHost);
         break;
+      case 'STORM':
+        var stormUIServerHost = this.getMasterComponentHostValue('STORM_UI_SERVER');
+        var logviewerServerHost = this.getMasterComponentHostValue('LOGVIEWER_SERVER');
+        var drpcServerHost = this.getMasterComponentHostValue('DRPC_SERVER');
+
+        var stormUIServerHostConfig = serviceConfigs.findProperty('name','stormuiserver_host');
+        var logviewerServerHostConfig = serviceConfigs.findProperty('name','logviewerserver_host');
+        var drpcServerHostConfig = serviceConfigs.findProperty('name','drpcserver_host');
+
+        stormUIServerHostConfig.defaultValue = stormUIServerHost;
+        logviewerServerHostConfig.defaultValue = logviewerServerHost;
+        drpcServerHostConfig.defaultValue = drpcServerHost;
+
+        globalConfigs.push(stormUIServerHostConfig);
+        globalConfigs.push(logviewerServerHostConfig);
+        globalConfigs.push(drpcServerHostConfig);
+
+        var supervisorHosts = this.get('content.hostComponents').filterProperty('componentName','SUPERVISOR').mapProperty('host.hostName');
+        if (supervisorHosts.length > 0) {
+          var supervisorHostsConfig = serviceConfigs.findProperty('name', 'supervisor_hosts');
+          supervisorHostsConfig.defaultValue = supervisorHosts;
+          globalConfigs.push(supervisorHostsConfig);
+        }
+        break;
     }
   },
 
+  getMasterComponentHostValue: function(componentName) {
+    return this.get('content.hostComponents').findProperty('componentName', componentName).get('host.hostName')
+  },
   /**
    * Provides service component name and display-name information for
    * the current selected service.

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

@@ -234,6 +234,12 @@ App.WizardStep6Controller = Em.Controller.extend({
           label: self.getComponentDisplayName('HBASE_REGIONSERVER')
         }));
       }
+      if (this.isServiceSelected('STORM')) {
+        headers.pushObject(Em.Object.create({
+          name: 'SUPERVISOR',
+          label: self.getComponentDisplayName('SUPERVISOR')
+        }));
+      }
       headers.pushObject(Ember.Object.create({
         name: 'CLIENT',
         label: self.getComponentDisplayName('CLIENT')

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

@@ -945,7 +945,7 @@ App.WizardStep8Controller = Em.Controller.extend({
   },
 
   loadSuperVisorValue: function(component) {
-    var hostsCount = this.get('content.slaveComponentHosts').findProperty('componentName', 'CLIENT').hosts.length;
+    var hostsCount = this.get('content.slaveComponentHosts').findProperty('componentName', 'SUPERVISOR').hosts.length;
     var hostsText = hostsCount > 1 ? hostsCount + ' hosts' : hostsCount + ' host'
     component.set('component_value', hostsText);
   },

ambari-web/app/data/HDP2/global_properties.js

@@ -1332,7 +1332,7 @@ module.exports =
       "displayType": "masterHost",
       "isReconfigurable": false,
       "isVisible": true,
-      "isRequiredByAgent": true,
+      "isRequiredByAgent": false,
       "serviceName": "STORM",
       "category": "StormUIServer"
     },
@@ -1345,7 +1345,7 @@ module.exports =
       "displayType": "masterHost",
       "isReconfigurable": false,
       "isVisible": true,
-      "isRequiredByAgent": true,
+      "isRequiredByAgent": false,
       "serviceName": "STORM",
       "category": "LogviewerServer"
     },
@@ -1358,10 +1358,24 @@ module.exports =
       "displayType": "masterHost",
       "isReconfigurable": false,
       "isVisible": true,
-      "isRequiredByAgent": true,
+      "isRequiredByAgent": false,
       "serviceName": "STORM",
       "category": "DRPCServer"
     },
+    {
+      "id": "puppet var",
+      "name": "supervisor_hosts",
+      "displayName": "Supervisor hosts",
+      "description": "",
+      "defaultValue": "",
+      "displayType": "masterHosts",
+      "isReconfigurable": false,
+      "isVisible": true,
+      "isRequiredByAgent": false,
+      "serviceName": "STORM",
+      "isOverridable": false,
+      "category": "Supervisor"
+    },
   /**********************************************MISC***************************************/
     {
       "id": "puppet var",

ambari-web/app/data/service_components.js

@@ -351,8 +351,8 @@ module.exports = new Ember.Set([
     component_name: 'SUPERVISOR',
     display_name: 'Supervisor',
     isMaster: false,
-    isClient: true,
-    description: 'Client component for STORM'
+    isClient: false,
+    description: 'Slave component for STORM'
   },
   {
     service_name: 'STORM',

ambari-web/app/models/host_component.js

@@ -31,7 +31,7 @@ App.HostComponent = DS.Model.extend({
    * @returns {bool}
    */
   isClient:function () {
-    if(['PIG', 'SQOOP', 'HCAT', 'MAPREDUCE2_CLIENT','SUPERVISOR'].contains(this.get('componentName'))){
+    if(['PIG', 'SQOOP', 'HCAT', 'MAPREDUCE2_CLIENT'].contains(this.get('componentName'))){
       return true;
     }
 
@@ -101,6 +101,7 @@ App.HostComponent = DS.Model.extend({
       case 'GANGLIA_MONITOR':
       case 'NODEMANAGER':
       case 'ZKFC':
+      case 'SUPERVISOR':
         return true;
       default:
         return false;

ambari-web/app/models/service_config.js

@@ -411,6 +411,10 @@ App.ServiceConfigProperty = Ember.Object.extend({
         if (!App.supports.storm) return; // @todo remove test mode check after Storm service integration
         this.set('value', masterComponentHostsInDB.findProperty('component', 'STORM_UI_SERVER').hostName);
         break;
+      case 'supervisor_hosts':
+        if (!App.supports.storm) return; // @todo remove test mode check after Storm service integration
+        this.set('value', slaveComponentHostsInDB.findProperty('componentName', 'SUPERVISOR').hosts.mapProperty('hostName'));
+        break;
       case 'hbase.zookeeper.quorum':
         var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName');
         this.setDefaultValue("(\\w*)", zkHosts);

ambari-web/app/views/main/host/summary.js

@@ -224,6 +224,7 @@ App.MainHostSummaryView = Em.View.extend({
     var zookeeperServerExists = false;
     var nodeManagerExists = false;
     var hbaseMasterExists = false;
+    var supervisorExists = false;
     
     var installableClients = this.get('installableClientComponents');
     
@@ -247,6 +248,9 @@ App.MainHostSummaryView = Em.View.extend({
         case 'HBASE_MASTER':
           hbaseMasterExists = true;
           break;
+        case 'SUPERVISOR':
+          supervisorExists = true;
+          break;
       }
     }, this);
 
@@ -268,6 +272,9 @@ App.MainHostSummaryView = Em.View.extend({
     if (!nodeManagerExists && services.findProperty('serviceName', 'YARN')) {
       components.pushObject(this.addableComponentObject.create({ 'componentName': 'NODEMANAGER' }));
     }
+    if (!supervisorExists && services.findProperty('serviceName', 'STORM')) {
+      components.pushObject(this.addableComponentObject.create({ 'componentName': 'SUPERVISOR' }));
+    }
     if (installableClients.length > 0) {
       components.pushObject(this.addableComponentObject.create({ 'componentName': 'CLIENTS', subComponentNames: installableClients }));
     }