AMBARI-6755. ATS is marked as slave component but appears on Assign Master Page on web-ui.(vbrodetskyi)

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py

@@ -176,12 +176,12 @@ def isClient(component):
 def isSlave(component):
   componentName = component["StackServiceComponents"]["component_name"]
   isSlave = component["StackServiceComponents"]["component_category"] == 'SLAVE'
-  return isSlave and componentName != 'APP_TIMELINE_SERVER'
+  return isSlave
 
 def isMaster(component):
   componentName = component["StackServiceComponents"]["component_name"]
   isMaster = component["StackServiceComponents"]["is_master"]
-  return isMaster or componentName == 'APP_TIMELINE_SERVER'
+  return isMaster
 
 def isLocalHost(hostName):
   return socket.getfqdn(hostName) == socket.getfqdn()

ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/metainfo.xml

@@ -27,7 +27,7 @@
 
         <component>
           <name>APP_TIMELINE_SERVER</name>
-          <category>SLAVE</category>
+          <category>MASTER</category>
           <cardinality>1</cardinality>
           <commandScript>
             <script>scripts/application_timeline_server.py</script>

ambari-server/src/main/resources/stacks/HDP/2.1/services/YARN/metainfo.xml

@@ -27,7 +27,7 @@
 
         <component>
           <name>APP_TIMELINE_SERVER</name>
-          <category>SLAVE</category>
+          <category>MASTER</category>
           <cardinality>0-1</cardinality>
           <commandScript>
             <script>scripts/application_timeline_server.py</script>

ambari-web/app/app.js

@@ -188,10 +188,6 @@ module.exports = Em.Application.create({
 
     clients: function () {
       return App.StackServiceComponent.find().filterProperty('isClient').mapProperty('componentName')
-    }.property('App.router.clusterController.isLoaded'),
-
-    masterBehavior: function () {
-      return App.StackServiceComponent.find().filterProperty('isMasterBehavior').mapProperty('componentName')
     }.property('App.router.clusterController.isLoaded')
   })
 });

ambari-web/app/controllers/wizard.js

@@ -974,7 +974,7 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, {
    */
   loadMasterComponentHosts: function () {
     var masterComponentHosts = this.getDBProperty('masterComponentHosts');
-    var stackMasterComponents = App.get('components.masters').concat(App.get('components.masterBehavior')).uniq();
+    var stackMasterComponents = App.get('components.masters').uniq();
     if (!masterComponentHosts) {
       masterComponentHosts = [];
       App.HostComponent.find().filter(function(component) {

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

@@ -686,7 +686,7 @@ App.WizardStep8Controller = Em.Controller.extend({
       componentValue = this[component.get('customHandler')].call(this, component);
     }
     else {
-      if (component.get('isMaster') || component.get('isMasterBehavior')) {
+      if (component.get('isMaster')) {
         componentValue = this.getMasterComponentValue(component.get('componentName'));
       }
       else {

ambari-web/app/models/stack_service_component.js

@@ -89,7 +89,7 @@ App.StackServiceComponent = DS.Model.extend({
 
   /** @property {Boolean} isRollinRestartAllowed - component supports rolling restart action **/
   isRollinRestartAllowed: function() {
-    return this.get('isSlave') && !this.get('isMasterBehavior');
+    return this.get('isSlave');
   }.property('componentName'),
 
   /** @property {Boolean} isDecommissionAllowed - component supports decommission action **/
@@ -117,7 +117,7 @@ App.StackServiceComponent = DS.Model.extend({
   isShownOnInstallerAssignMasterPage: function() {
     var component = this.get('componentName');
     var mastersNotShown = ['MYSQL_SERVER'];
-    return ((this.get('isMaster') && !mastersNotShown.contains(component)) || component === 'APP_TIMELINE_SERVER');
+    return this.get('isMaster') && !mastersNotShown.contains(component);
   }.property('isMaster','componentName'),
 
   /** @property {Boolean} isShownOnInstallerSlaveClientPage - component visible on "Assign Slaves and Clients" step of Install Wizard**/
@@ -154,12 +154,7 @@ App.StackServiceComponent = DS.Model.extend({
     return this.get('isMaster') && this.get('isMultipleAllowed') && this.get('maxToInstall') > 2;
   }.property('componentName'),
 
-  /** @property {Boolean} isMasterBehavior - Some non master components can be assigned as master **/
-  isMasterBehavior: function() {
-    var componentsName = ['APP_TIMELINE_SERVER'];
-    return componentsName.contains(this.get('componentName'));
-  }.property('componentName'),
-
+ 
   /** @property {Boolean} isClientBehavior - Some non client components can be assigned as clients.
    *
    * Used for ignoring such components as Ganglia Monitor on Installer "Review" step.

ambari-web/app/views/main/service/service.js

@@ -134,9 +134,7 @@ App.MainDashboardServiceView = Em.View.extend({
     },
     templateName: require('templates/main/service/info/summary/master_components'),
     mastersComp: function () {
-      return this.get('parentView.service.hostComponents').filter(function (component) {
-        return component.get('isMaster') || App.get('components.masterBehavior').contains(component.get('componentName'));
-      });
+      return this.get('parentView.service.hostComponents').filterProperty('isMaster', true);
     }.property("service")
   }),
 

ambari-web/test/models/stack_service_component_test.js

@@ -48,7 +48,6 @@ require('models/stack_service_component');
       isShownOnAddServiceAssignMasterPage: false,
       isMasterWithMultipleInstances: false,
       isMasterAddableInstallerWizard: false,
-      isMasterBehavior: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
       isNotPreferableOnAmbariServerHost: false,
@@ -103,7 +102,6 @@ var componentPropertiesValidationTests = [
       isShownOnAddServiceAssignMasterPage: true,
       isMasterWithMultipleInstances: true,
       isMasterAddableInstallerWizard: true,
-      isMasterBehavior: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
       isNotPreferableOnAmbariServerHost: false,
@@ -135,7 +133,6 @@ var componentPropertiesValidationTests = [
       isShownOnAddServiceAssignMasterPage: true,
       isMasterWithMultipleInstances: false,
       isMasterAddableInstallerWizard: false,
-      isMasterBehavior: true,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
       isNotPreferableOnAmbariServerHost: false,
@@ -166,7 +163,6 @@ var componentPropertiesValidationTests = [
       isShownOnAddServiceAssignMasterPage: false,
       isMasterWithMultipleInstances: false,
       isMasterAddableInstallerWizard: false,
-      isMasterBehavior: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: true,
       isNotPreferableOnAmbariServerHost: false,
@@ -197,7 +193,6 @@ var componentPropertiesValidationTests = [
       isShownOnAddServiceAssignMasterPage: false,
       isMasterWithMultipleInstances: false,
       isMasterAddableInstallerWizard: false,
-      isMasterBehavior: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
       isNotPreferableOnAmbariServerHost: false,
@@ -228,7 +223,6 @@ var componentPropertiesValidationTests = [
       isShownOnAddServiceAssignMasterPage: true,
       isMasterWithMultipleInstances: false,
       isMasterAddableInstallerWizard: false,
-      isMasterBehavior: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
       isNotPreferableOnAmbariServerHost: false,
@@ -259,7 +253,6 @@ var componentPropertiesValidationTests = [
       isShownOnAddServiceAssignMasterPage: true,
       isMasterWithMultipleInstances: false,
       isMasterAddableInstallerWizard: false,
-      isMasterBehavior: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
       isNotPreferableOnAmbariServerHost: false,
@@ -290,7 +283,6 @@ var componentPropertiesValidationTests = [
       isShownOnAddServiceAssignMasterPage: false,
       isMasterWithMultipleInstances: false,
       isMasterAddableInstallerWizard: false,
-      isMasterBehavior: false,
       isHAComponentOnly: false,
       isRequiredOnAllHosts: false,
       isNotPreferableOnAmbariServerHost: false,
@@ -323,4 +315,4 @@ describe('App.StackServiceComponent', function() {
   after(function() {
     modelSetup.cleanStackServiceComponent();
   });
-});
+});

ambari-web/test/service_components.js

@@ -1322,10 +1322,10 @@ module.exports = {
           "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/YARN/components/APP_TIMELINE_SERVER",
           "StackServiceComponents" : {
             "cardinality" : "0-1",
-            "component_category" : "SLAVE",
+            "component_category" : "MASTER",
             "component_name" : "APP_TIMELINE_SERVER",
             "is_client" : false,
-            "is_master" : false,
+            "is_master" : true,
             "service_name" : "YARN",
             "stack_name" : "HDP",
             "stack_version" : "2.1"