Repository: ambari Updated Branches: refs/heads/trunk 760365647 -> 8531c115f
AMBARI-15813. Enable Hive Interactive is turned ON by default. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8531c115 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8531c115 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8531c115 Branch: refs/heads/trunk Commit: 8531c115f8e3b814974efc3a75ecfa379ab7f764 Parents: 7603656 Author: Jaimin Jetly <[email protected]> Authored: Mon Apr 11 16:53:45 2016 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Mon Apr 11 16:54:16 2016 -0700 ---------------------------------------------------------------------- .../app/controllers/wizard/step6_controller.js | 22 +++++--------------- .../app/models/stack_service_component.js | 3 +++ 2 files changed, 8 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8531c115/ambari-web/app/controllers/wizard/step6_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js index 1e1feb5..ff8f36a 100644 --- a/ambari-web/app/controllers/wizard/step6_controller.js +++ b/ambari-web/app/controllers/wizard/step6_controller.js @@ -592,31 +592,19 @@ App.WizardStep6Controller = Em.Controller.extend(App.BlueprintMixin, { }).mapProperty("componentName"); if (this.get('isInstallerWizard') || this.get('isAddServiceWizard')) { masterBlueprint = self.getCurrentMastersBlueprint(); - - var invisibleMasters = []; - if (this.get('isInstallerWizard')) { - invisibleMasters = App.StackServiceComponent.find().filterProperty("isMaster").filterProperty("isShownOnInstallerAssignMasterPage", false).mapProperty("componentName"); - } - else - if (this.get('isAddServiceWizard')) { - invisibleMasters = App.StackServiceComponent.find().filterProperty("isMaster").filterProperty("isShownOnAddServiceAssignMasterPage", false).mapProperty("componentName"); - } - var selectedClientComponents = self.get('content.clients').mapProperty('component_name'); var alreadyInstalledClients = App.get('components.clients').reject(function (c) { return selectedClientComponents.contains(c); }); - var invisibleComponents = invisibleMasters.concat(invisibleSlavesAndClients).concat(alreadyInstalledClients); + var invisibleComponents = invisibleSlavesAndClients.concat(alreadyInstalledClients); var invisibleBlueprint = blueprintUtils.filterByComponents(this.get('content.recommendations'), invisibleComponents); masterBlueprint = blueprintUtils.mergeBlueprints(masterBlueprint, invisibleBlueprint); - } - else - if (this.get('isAddHostWizard')) { - masterBlueprint = self.getCurrentMasterSlaveBlueprint(); - hostNames = hostNames.concat(App.Host.find().mapProperty("hostName")).uniq(); - slaveBlueprint = blueprintUtils.addComponentsToBlueprint(slaveBlueprint, invisibleSlavesAndClients); + } else if (this.get('isAddHostWizard')) { + masterBlueprint = self.getCurrentMasterSlaveBlueprint(); + hostNames = hostNames.concat(App.Host.find().mapProperty("hostName")).uniq(); + slaveBlueprint = blueprintUtils.addComponentsToBlueprint(slaveBlueprint, invisibleSlavesAndClients); } var bluePrintsForValidation = blueprintUtils.mergeBlueprints(masterBlueprint, slaveBlueprint); http://git-wip-us.apache.org/repos/asf/ambari/blob/8531c115/ambari-web/app/models/stack_service_component.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/stack_service_component.js b/ambari-web/app/models/stack_service_component.js index 26244f7..a350f15 100644 --- a/ambari-web/app/models/stack_service_component.js +++ b/ambari-web/app/models/stack_service_component.js @@ -107,6 +107,7 @@ App.StackServiceComponent = DS.Model.extend({ }.property('componentName'), /** @property {Boolean} isShownOnInstallerAssignMasterPage - component visible on "Assign Masters" step of Install Wizard **/ + // Note: Components that are not visible on Assign Master Page are not saved as part of host component recommendation/validation layout isShownOnInstallerAssignMasterPage: function() { var component = this.get('componentName'); var mastersNotShown = ['MYSQL_SERVER', 'POSTGRESQL_SERVER', 'HIVE_SERVER_INTERACTIVE']; @@ -114,6 +115,7 @@ App.StackServiceComponent = DS.Model.extend({ }.property('isMaster','componentName'), /** @property {Boolean} isShownOnInstallerSlaveClientPage - component visible on "Assign Slaves and Clients" step of Install Wizard**/ + // Note: Components that are not visible on Assign Slaves and Clients Page are saved as part of host component recommendation/validation layout isShownOnInstallerSlaveClientPage: function() { var component = this.get('componentName'); var slavesNotShown = ['JOURNALNODE','ZKFC','APP_TIMELINE_SERVER']; @@ -121,6 +123,7 @@ App.StackServiceComponent = DS.Model.extend({ }.property('isSlave','componentName', 'isRequiredOnAllHosts'), /** @property {Boolean} isShownOnAddServiceAssignMasterPage - component visible on "Assign Masters" step of Add Service Wizard **/ + // Note: Components that are not visible on Assign Master Page are not saved as part of host component recommendation/validation layout isShownOnAddServiceAssignMasterPage: function() { var isVisible = this.get('isShownOnInstallerAssignMasterPage'); if (App.get('isHaEnabled')) {
