Repository: ambari Updated Branches: refs/heads/trunk 84ad5db98 -> 874ab5cc5
AMBARI-6213. In HA mode HDFS Summary page does not show which NameNode is Active and which is in Standby.(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/874ab5cc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/874ab5cc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/874ab5cc Branch: refs/heads/trunk Commit: 874ab5cc557aa571c535acc84e8cba4733c1e381 Parents: 84ad5db Author: Xi Wang <xiw...@apache.org> Authored: Thu Jun 19 15:02:52 2014 -0700 Committer: Xi Wang <xiw...@apache.org> Committed: Thu Jun 19 18:31:41 2014 -0700 ---------------------------------------------------------------------- ambari-web/app/mappers/service_metrics_mapper.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/874ab5cc/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 e874006..1a3d4f3 100644 --- a/ambari-web/app/mappers/service_metrics_mapper.js +++ b/ambari-web/app/mappers/service_metrics_mapper.js @@ -309,17 +309,18 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({ hostComponents.forEach(function (hostComponent) { var service = services.findProperty('ServiceInfo.service_name', hostComponent.service_id); if (hostComponent) { - // set advanced nameNode display name for HA, active or standby NameNode - // this is useful on three places: hdfs health status hover tooltip, hdfs service summary and NN component on host detail page + // set advanced nameNode display name for HA, Active NameNode or Standby NameNode + // this is useful on three places: 1) HDFS health status hover tooltip, 2) HDFS service summary 3) NameNode component on host detail page if (hostComponent.component_name === 'NAMENODE' && !isSecondaryNamenode) { var hdfs = this.hdfsMapper(service); var hostName = hostComponent.host_id; var activeNNText = Em.I18n.t('services.service.summary.nameNode.active'); var standbyNNText = Em.I18n.t('services.service.summary.nameNode.standby'); if (hdfs) { - if (hostName == hdfs.active_name_node_id) { + // active_name_node_id format : NAMENODE_c6401.ambari.apache.org + if (hdfs.active_name_node_id && hdfs.active_name_node_id.contains(hostName)) { hostComponent.display_name_advanced = activeNNText; - } else if (hostName == hdfs.standby_name_node_id || hostName == hdfs.standby_name_node2_id) { + } else if ((hdfs.standby_name_node_id && hdfs.standby_name_node_id.contains(hostName)) || ( hdfs.standby_name_node2_id && hdfs.standby_name_node2_id.contains(hostName))) { hostComponent.display_name_advanced = standbyNNText; } else { hostComponent.display_name_advanced = null;
