AMBARI-4012. NameNode max heap is not showing in HDP 1.3.2 stack. (xiwang via yusaku)

ambari-web/app/controllers/global/update_controller.js

@@ -147,7 +147,8 @@ App.UpdateController = Em.Controller.extend({
       'host_components/HostRoles/state,' +
       'host_components/HostRoles/stale_configs,' +
       'host_components/metrics/jvm/memHeapUsedM,' +
-      'host_components/metrics/jvm/memMaxM,' +
+      'host_components/metrics/jvm/HeapMemoryMax,' +
+      'host_components/metrics/jvm/HeapMemoryUsed,' +
       'host_components/metrics/jvm/memHeapCommittedM,' +
       'host_components/metrics/mapred/jobtracker/trackers_decommissioned,' +
       'host_components/metrics/cpu/cpu_wio,' +

ambari-web/app/mappers/service_metrics_mapper.js

@@ -40,8 +40,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
     standby_name_node2_id: 'standby_name_node2_id',
     journal_nodes: 'journal_nodes',
     name_node_start_time: 'nameNodeComponent.host_components[0].metrics.runtime.StartTime',
-    jvm_memory_heap_used: 'nameNodeComponent.host_components[0].metrics.jvm.memHeapUsedM',
-    jvm_memory_heap_max: 'nameNodeComponent.host_components[0].metrics.jvm.memMaxM',
+    jvm_memory_heap_used: 'nameNodeComponent.host_components[0].metrics.jvm.HeapMemoryUsed',
+    jvm_memory_heap_max: 'nameNodeComponent.host_components[0].metrics.jvm.HeapMemoryMax',
     live_data_nodes: 'live_data_nodes',
     dead_data_nodes: 'dead_data_nodes',
     decommission_data_nodes: 'decommission_data_nodes',
@@ -63,8 +63,8 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
     resource_manager_node_id: 'resourceManagerComponent.host_components[0].HostRoles.host_name',
     node_manager_live_nodes: 'node_manager_live_nodes',
     resource_manager_start_time: 'resourceManagerComponent.ServiceComponentInfo.StartTime',
-    jvm_memory_heap_used: 'resourceManagerComponent.host_components[0].metrics.jvm.memHeapUsedM',
-    jvm_memory_heap_max: 'resourceManagerComponent.host_components[0].metrics.jvm.memMaxM',
+    jvm_memory_heap_used: 'resourceManagerComponent.host_components[0].metrics.jvm.HeapMemoryUsed',
+    jvm_memory_heap_max: 'resourceManagerComponent.host_components[0].metrics.jvm.HeapMemoryMax',
     containers_allocated: 'resourceManagerComponent.host_components[0].metrics.yarn.Queue.root.AllocatedContainers',
     containers_pending: 'resourceManagerComponent.host_components[0].metrics.yarn.Queue.root.PendingContainers',
     containers_reserved: 'resourceManagerComponent.host_components[0].metrics.yarn.Queue.root.ReservedContainers',

ambari-web/app/views/main/dashboard/service/hdfs.js

@@ -138,9 +138,9 @@ App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
     var memMax = this.get('service').get('jvmMemoryHeapMax');
     var percent = memMax > 0 ? ((100 * memUsed) / memMax) : 0;
     return this.t('dashboard.services.hdfs.nodes.heapUsed').format(
-        numberUtils.bytesToSize(memUsed, 1, 'parseFloat', 1024 * 1024), 
-        numberUtils.bytesToSize(memMax, 1, 'parseFloat', 1024 * 1024),
-        percent.toFixed(1));
+      numberUtils.bytesToSize(memUsed, 1, 'parseFloat'),
+      numberUtils.bytesToSize(memMax, 1, 'parseFloat'),
+      percent.toFixed(1));
   }.property('service.jvmMemoryHeapUsed', 'service.jvmMemoryHeapMax'),
 
   summaryHeader: function () {

ambari-web/app/views/main/dashboard/service/yarn.js

@@ -28,10 +28,9 @@ App.MainDashboardServiceYARNView = App.MainDashboardServiceView.extend({
     var memMax = this.get('service').get('jvmMemoryHeapMax');
     var percent = memMax > 0 ? ((100 * memUsed) / memMax) : 0;
     return this.t('dashboard.services.hdfs.nodes.heapUsed').format(
-        numberUtils.bytesToSize(memUsed, 1, 'parseFloat', 1024 * 1024), 
-        numberUtils.bytesToSize(memMax, 1, 'parseFloat', 1024 * 1024),
-        percent.toFixed(1));
-
+      numberUtils.bytesToSize(memUsed, 1, 'parseFloat'),
+      numberUtils.bytesToSize(memMax, 1, 'parseFloat'),
+      percent.toFixed(1));
   }.property('service.jvmMemoryHeapUsed', 'service.jvmMemoryHeapMax'),
 
   summaryHeader: function () {

ambari-web/app/views/main/dashboard/widgets/jobtracker_heap.js

@@ -30,6 +30,14 @@ App.JobTrackerHeapPieChartView = App.PieChartDashboardWidgetView.extend({
 
   widgetHtmlId: 'widget-jt-heap',
 
+  getUsed: function() {
+    return (this.get('model').get(this.get('modelFieldUsed')) / (1024 * 1024)) || 0;
+  },
+
+  getMax: function() {
+    return (this.get('model').get(this.get('modelFieldMax')) / (1024 * 1024)) || 0;
+  },
+
   didInsertElement: function() {
     this._super();
     this.calc();

ambari-web/app/views/main/dashboard/widgets/namenode_heap.js

@@ -29,6 +29,14 @@ App.NameNodeHeapPieChartView = App.PieChartDashboardWidgetView.extend({
   modelFieldUsed: 'jvmMemoryHeapUsed',
   widgetHtmlId: 'widget-nn-heap',
 
+  getUsed: function() {
+    return (this.get('model').get(this.get('modelFieldUsed')) / (1024 * 1024)) || 0;
+  },
+
+  getMax: function() {
+    return (this.get('model').get(this.get('modelFieldMax')) / (1024 * 1024)) || 0;
+  },
+
   didInsertElement: function() {
     this._super();
     this.calc();

ambari-web/app/views/main/dashboard/widgets/pie_chart_widget.js

@@ -59,8 +59,8 @@ App.PieChartDashboardWidgetView = App.DashboardWidgetView.extend({
   },
 
   calcDataForPieChart: function() {
-    var used = this.get('model').get(this.get('modelFieldUsed'));
-    var total = this.get('model').get(this.get('modelFieldMax'));
+    var used = this.getUsed();
+    var total = this.getMax();
     var percent = total > 0 ? ((used)*100 / total).toFixed() : 0;
     var percent_precise = total > 0 ? ((used)*100 / total).toFixed(1) : 0;
     return [percent, percent_precise];

ambari-web/app/views/main/dashboard/widgets/resource_manager_heap.js

@@ -29,6 +29,14 @@ App.ResourceManagerHeapPieChartView = App.PieChartDashboardWidgetView.extend({
   modelFieldUsed: 'jvmMemoryHeapUsed',
   widgetHtmlId: 'widget-rm-heap',
 
+  getUsed: function() {
+    return (this.get('model').get(this.get('modelFieldUsed')) / (1024 * 1024)) || 0;
+  },
+
+  getMax: function() {
+    return (this.get('model').get(this.get('modelFieldMax')) / (1024 * 1024)) || 0;
+  },
+
   didInsertElement: function() {
     this._super();
     this.calc();