You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/06/06 08:23:29 UTC
ambari git commit: AMBARI-11746. Create Widget: Active HBase Master
is not an available option. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 74d73d662 -> 84ec95496
AMBARI-11746. Create Widget: Active HBase Master is not an available option. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/84ec9549
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/84ec9549
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/84ec9549
Branch: refs/heads/branch-2.1
Commit: 84ec954969da37b8fb9951315b74a76817d7e793
Parents: 74d73d6
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Fri Jun 5 23:22:11 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Fri Jun 5 23:22:20 2015 -0700
----------------------------------------------------------------------
.../main/service/widgets/create/wizard_controller.js | 3 +++
ambari-web/app/mixins/common/widgets/widget_mixin.js | 10 +++++-----
.../views/main/service/widgets/create/expression_view.js | 7 +------
3 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/84ec9549/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js b/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js
index d6a92ef..69f63ed 100644
--- a/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js
+++ b/ambari-web/app/controllers/main/service/widgets/create/wizard_controller.js
@@ -325,6 +325,9 @@ App.WidgetWizardController = App.WizardController.extend({
case 'RESOURCEMANAGER':
metricObj.host_component_criteria = 'host_components/HostRoles/ha_state=ACTIVE';
break;
+ case 'HBASE_MASTER':
+ metricObj.host_component_criteria = 'host_components/metrics/hbase/master/IsActiveMaster=true';
+ break;
default:
metricObj.host_component_criteria = ' ';
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/84ec9549/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 95c7555..961ce7d 100644
--- a/ambari-web/app/mixins/common/widgets/widget_mixin.js
+++ b/ambari-web/app/mixins/common/widgets/widget_mixin.js
@@ -188,21 +188,21 @@ 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);
- if (hdfs.get('isNnHaEnabled')) {
- return request.host_component_criteria.replace('host_components/', '&');
+ if (!hdfs.get('isNnHaEnabled')) {
+ return '';
}
}
break;
case 'RESOURCEMANAGER':
if (request.host_component_criteria === 'host_components/HostRoles/ha_state=ACTIVE') {
var yarn = App.YARNService.find().objectAt(0);
- if (yarn.get('isRMHaEnabled')) {
- return request.host_component_criteria.replace('host_components/', '&');
+ if (!yarn.get('isRMHaEnabled')) {
+ return '';
}
}
break;
}
- return '';
+ return request.host_component_criteria.replace('host_components/', '&').trim();
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/84ec9549/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 eb41656..dc1f493 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
@@ -335,15 +335,10 @@ App.AddMetricExpressionView = Em.View.extend({
for (var serviceName in servicesMap) {
var components = [];
for (var componentId in servicesMap[serviceName].components) {
-
- //HBase service should not show "Active HBase master"
- 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;
+ if (isHostComponentAbsent) continue;
var component = Em.Object.create({
componentName: servicesMap[serviceName].components[componentId].component_name,
level: servicesMap[serviceName].components[componentId].level,