Repository: ambari Updated Branches: refs/heads/trunk ee8e2f650 -> f57d0e2ec
AMBARI-11407. Create widget wizard: Metric selection shown for JournalNode in non NN HA cluster. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8f5af335 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8f5af335 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8f5af335 Branch: refs/heads/trunk Commit: 8f5af335eae4f03699cc6807a930b7b6829e9f9c Parents: ee8e2f6 Author: Jaimin Jetly <[email protected]> Authored: Tue May 26 19:00:07 2015 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Tue May 26 19:00:07 2015 -0700 ---------------------------------------------------------------------- ambari-web/app/mixins/common/widgets/widget_mixin.js | 3 +-- ambari-web/app/models/service/hdfs.js | 3 +++ .../app/views/main/service/widgets/create/expression_view.js | 8 ++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8f5af335/ambari-web/app/mixins/common/widgets/widget_mixin.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/widgets/widget_mixin.js b/ambari-web/app/mixins/common/widgets/widget_mixin.js index 9e20cf4..264d19f 100644 --- a/ambari-web/app/mixins/common/widgets/widget_mixin.js +++ b/ambari-web/app/mixins/common/widgets/widget_mixin.js @@ -173,8 +173,7 @@ App.WidgetMixin = Ember.Mixin.create({ case 'NAMENODE': if (request.host_component_criteria === 'host_components/metrics/dfs/FSNamesystem/HAState=active') { var hdfs = App.HDFSService.find().objectAt(0); - var activeNNHostName = !hdfs.get('snameNode') && hdfs.get('activeNameNode'); - if (!activeNNHostName) { + if (!hdfs.get('isNnHaEnabled')) { return ''; } } http://git-wip-us.apache.org/repos/asf/ambari/blob/8f5af335/ambari-web/app/models/service/hdfs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/service/hdfs.js b/ambari-web/app/models/service/hdfs.js index d00479f..3cb1cef 100644 --- a/ambari-web/app/models/service/hdfs.js +++ b/ambari-web/app/models/service/hdfs.js @@ -28,6 +28,9 @@ App.HDFSService = App.Service.extend({ activeNameNode: DS.belongsTo('App.HostComponent'), standbyNameNode: DS.belongsTo('App.HostComponent'), standbyNameNode2: DS.belongsTo('App.HostComponent'), + isNnHaEnabled: function() { + return !this.get('snameNode') && this.get('hostComponents').filterProperty('componentName', 'NAMENODE').length > 1; + }.property('snameNode','hostComponents'), dataNodesStarted: DS.attr('number'), dataNodesInstalled: DS.attr('number'), dataNodesTotal: DS.attr('number'), http://git-wip-us.apache.org/repos/asf/ambari/blob/8f5af335/ambari-web/app/views/main/service/widgets/create/expression_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/widgets/create/expression_view.js b/ambari-web/app/views/main/service/widgets/create/expression_view.js index 9900915..1c56fe5 100644 --- a/ambari-web/app/views/main/service/widgets/create/expression_view.js +++ b/ambari-web/app/views/main/service/widgets/create/expression_view.js @@ -336,9 +336,13 @@ App.AddMetricExpressionView = Em.View.extend({ for (var componentId in servicesMap[serviceName].components) { //HBase service should not show "Active HBase master" - if (servicesMap[serviceName].components[componentId].component_name === 'HBASE_MASTER' && - servicesMap[serviceName].components[componentId].level === 'HOSTCOMPONENT') continue; + var isActiveHbaseMaster = servicesMap[serviceName].components[componentId].component_name === 'HBASE_MASTER' && + servicesMap[serviceName].components[componentId].level === 'HOSTCOMPONENT'; + // Hide the option if none of the hostComponent is created in the cluster yet + var componentName = servicesMap[serviceName].components[componentId].component_name; + var isHostComponentAbsent = !App.HostComponent.find().filterProperty('componentName',componentName).length; + if (isActiveHbaseMaster || isHostComponentAbsent) continue; var component = Em.Object.create({ componentName: servicesMap[serviceName].components[componentId].component_name, level: servicesMap[serviceName].components[componentId].level,
