Author: jaimin
Date: Fri Jun 21 17:49:02 2013
New Revision: 1495518
URL: http://svn.apache.org/r1495518
Log:
AMBARI-2459. HBase health status incorrectly showing down (red) when HBase
master is up. (jaimin)
Modified:
incubator/ambari/trunk/ambari-web/app/models/service.js
incubator/ambari/trunk/ambari-web/app/views/common/quick_view_link_view.js
Modified: incubator/ambari/trunk/ambari-web/app/models/service.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/models/service.js?rev=1495518&r1=1495517&r2=1495518&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/models/service.js (original)
+++ incubator/ambari/trunk/ambari-web/app/models/service.js Fri Jun 21 17:49:02
2013
@@ -59,7 +59,7 @@ App.Service = DS.Model.extend({
this.set('healthStatus', 'red-blinking');
}
- if (this.get('serviceName') === 'HBASE') {
+ if (this.get('serviceName') === 'HBASE' &&
App.supports.multipleHBaseMasters) {
var active = this.get('hostComponents').findProperty('haStatus',
'active');
if (!active) {
this.set('healthStatus', 'red');
Modified:
incubator/ambari/trunk/ambari-web/app/views/common/quick_view_link_view.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/common/quick_view_link_view.js?rev=1495518&r1=1495517&r2=1495518&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/common/quick_view_link_view.js
(original)
+++ incubator/ambari/trunk/ambari-web/app/views/common/quick_view_link_view.js
Fri Jun 21 17:49:02 2013
@@ -33,14 +33,18 @@ App.QuickViewLinks = Em.View.extend({
} else if (serviceName === 'MAPREDUCE') {
host = App.singleNodeInstall ? App.singleNodeAlias :
components.findProperty('componentName',
'JOBTRACKER').get('host.publicHostName');
} else if (serviceName === 'HBASE') {
- var component = components.filterProperty('componentName',
'HBASE_MASTER').findProperty('haStatus', 'active');
- if(component){
- if(App.singleNodeInstall){
+ var component;
+ if (App.supports.multipleHBaseMasters) {
+ component = components.filterProperty('componentName',
'HBASE_MASTER').findProperty('haStatus', 'active');
+ } else {
+ component = components.findProperty('componentName', 'HBASE_MASTER');
+ }
+ if (component) {
+ if (App.singleNodeInstall) {
host = App.singleNodeAlias;
- }else{
+ } else {
host = component.get('host.publicHostName');
}
-
}
}
if (!host) {
