You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/03/17 16:40:24 UTC

ambari git commit: AMBARI-10106. With Yarn Rm HA enabled no mark for Active Resource Manager is displayed (alexantonenko)

Repository: ambari
Updated Branches:
  refs/heads/trunk 434ce972e -> 1db1692ee


AMBARI-10106. With Yarn Rm HA enabled no mark for Active Resource Manager is displayed (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1db1692e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1db1692e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1db1692e

Branch: refs/heads/trunk
Commit: 1db1692eec500c5d93332b8f0a3e3b6b752641bc
Parents: 434ce97
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Mar 17 17:40:07 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Mar 17 17:40:19 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/mappers/service_metrics_mapper.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1db1692e/ambari-web/app/mappers/service_metrics_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js b/ambari-web/app/mappers/service_metrics_mapper.js
index ade8cd7..a2189bb 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -181,9 +181,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
           host_component.id = host_component.HostRoles.component_name + "_" + host_component.HostRoles.host_name;
           previousComponentStatuses[host_component.id] = host_component.HostRoles.state;
           previousComponentPassiveStates[host_component.id] = host_component.HostRoles.maintenance_state;
-          if (host_component.HostRoles.component_name == "HBASE_MASTER") {
-            this.config3.ha_status = 'metrics.hbase.master.IsActiveMaster';
-          }
+          this.config3.ha_status = host_component.HostRoles.component_name == "HBASE_MASTER" ?
+            'metrics.hbase.master.IsActiveMaster' : 'HostRoles.ha_state';
           var comp = this.parseIt(host_component, this.config3);
           comp.service_id = serviceName;
           hostComponents.push(comp);