AMBARI-3878. ResourceManager Heap metrics is not correct on Ambari console. (xiwang via yusaku)

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

@@ -146,6 +146,7 @@ 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/memHeapCommittedM,' +
       'host_components/metrics/mapred/jobtracker/trackers_decommissioned,' +
       'host_components/metrics/cpu/cpu_wio,' +

ambari-web/app/mappers/service_mapper.js

@@ -41,7 +41,7 @@ App.servicesMapper = App.QuickDataMapper.create({
     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_committed: 'nameNodeComponent.host_components[0].metrics.jvm.memHeapCommittedM',
+    jvm_memory_heap_max: 'nameNodeComponent.host_components[0].metrics.jvm.memMaxM',
     live_data_nodes: 'live_data_nodes',
     dead_data_nodes: 'dead_data_nodes',
     decommission_data_nodes: 'decommission_data_nodes',
@@ -64,7 +64,7 @@ App.servicesMapper = App.QuickDataMapper.create({
     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_committed: 'resourceManagerComponent.host_components[0].metrics.jvm.memHeapCommittedM',
+    jvm_memory_heap_max: 'resourceManagerComponent.host_components[0].metrics.jvm.memMaxM',
     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/models/service/hdfs.js

@@ -30,7 +30,7 @@ App.HDFSService = App.Service.extend({
   journalNodes: DS.hasMany('App.Host'),
   nameNodeStartTime: DS.attr('number'),
   jvmMemoryHeapUsed: DS.attr('number'),
-  jvmMemoryHeapCommitted: DS.attr('number'),
+  jvmMemoryHeapMax: DS.attr('number'),
   liveDataNodes: DS.hasMany('App.Host'),
   deadDataNodes: DS.hasMany('App.Host'),
   decommissionDataNodes: DS.hasMany('App.Host'),

ambari-web/app/models/service/yarn.js

@@ -43,7 +43,7 @@ App.YARNService = App.Service.extend({
   }.property('hostComponents.length'),
   resourceManagerStartTime: DS.attr('number'),
   jvmMemoryHeapUsed: DS.attr('number'),
-  jvmMemoryHeapCommitted: DS.attr('number'),
+  jvmMemoryHeapMax: DS.attr('number'),
   allocatedMemory: DS.attr('number'),
   reservedMemory: DS.attr('number'),
   availableMemory: DS.attr('number'),

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

@@ -135,13 +135,13 @@ App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
 
   nodeHeap: function () {
     var memUsed = this.get('service').get('jvmMemoryHeapUsed');
-    var memCommitted = this.get('service').get('jvmMemoryHeapCommitted');
-    var percent = memCommitted > 0 ? ((100 * memUsed) / memCommitted) : 0;
+    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(memCommitted, 1, 'parseFloat', 1024 * 1024), 
+        numberUtils.bytesToSize(memMax, 1, 'parseFloat', 1024 * 1024),
         percent.toFixed(1));
-  }.property('service.jvmMemoryHeapUsed', 'service.jvmMemoryHeapCommitted'),
+  }.property('service.jvmMemoryHeapUsed', 'service.jvmMemoryHeapMax'),
 
   summaryHeader: function () {
     var text = this.t("dashboard.services.hdfs.summary");

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

@@ -25,14 +25,14 @@ App.MainDashboardServiceYARNView = App.MainDashboardServiceView.extend({
 
   nodeHeap: function () {
     var memUsed = this.get('service').get('jvmMemoryHeapUsed');
-    var memCommitted = this.get('service').get('jvmMemoryHeapCommitted');
-    var percent = memCommitted > 0 ? ((100 * memUsed) / memCommitted) : 0;
+    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(memCommitted, 1, 'parseFloat', 1024 * 1024), 
+        numberUtils.bytesToSize(memMax, 1, 'parseFloat', 1024 * 1024),
         percent.toFixed(1));
 
-  }.property('service.jvmMemoryHeapUsed', 'service.jvmMemoryHeapCommitted'),
+  }.property('service.jvmMemoryHeapUsed', 'service.jvmMemoryHeapMax'),
 
   summaryHeader: function () {
     var text = this.t("dashboard.services.yarn.summary");

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

@@ -25,7 +25,7 @@ App.NameNodeHeapPieChartView = App.PieChartDashboardWidgetView.extend({
   id: '1',
 
   model_type: 'hdfs',
-  modelFieldMax: 'jvmMemoryHeapCommitted',
+  modelFieldMax: 'jvmMemoryHeapMax',
   modelFieldUsed: 'jvmMemoryHeapUsed',
   widgetHtmlId: 'widget-nn-heap',
 

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

@@ -25,7 +25,7 @@ App.ResourceManagerHeapPieChartView = App.PieChartDashboardWidgetView.extend({
   id: '24',
 
   model_type: 'yarn',
-  modelFieldMax: 'jvmMemoryHeapCommitted',
+  modelFieldMax: 'jvmMemoryHeapMax',
   modelFieldUsed: 'jvmMemoryHeapUsed',
   widgetHtmlId: 'widget-rm-heap',