Updated Branches: refs/heads/branch-1.4.2 241ee6d35 -> e6bc84457
AMBARI-3878. ResourceManager Heap metrics is not correct on Ambari console. (xiwang via yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e6bc8445 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e6bc8445 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e6bc8445 Branch: refs/heads/branch-1.4.2 Commit: e6bc8445777419afda0a8dfe305528d8883370fa Parents: 241ee6d Author: Yusaku Sako <[email protected]> Authored: Mon Nov 25 18:15:27 2013 -0800 Committer: Yusaku Sako <[email protected]> Committed: Mon Nov 25 18:15:49 2013 -0800 ---------------------------------------------------------------------- ambari-web/app/controllers/global/update_controller.js | 1 + ambari-web/app/mappers/service_mapper.js | 4 ++-- ambari-web/app/models/service/hdfs.js | 2 +- ambari-web/app/models/service/yarn.js | 2 +- ambari-web/app/views/main/dashboard/service/hdfs.js | 8 ++++---- ambari-web/app/views/main/dashboard/service/yarn.js | 8 ++++---- ambari-web/app/views/main/dashboard/widgets/namenode_heap.js | 2 +- .../views/main/dashboard/widgets/resource_manager_heap.js | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e6bc8445/ambari-web/app/controllers/global/update_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js index cf1120d..1358627 100644 --- a/ambari-web/app/controllers/global/update_controller.js +++ b/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,' + http://git-wip-us.apache.org/repos/asf/ambari/blob/e6bc8445/ambari-web/app/mappers/service_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/service_mapper.js b/ambari-web/app/mappers/service_mapper.js index a255855..75bab15 100644 --- a/ambari-web/app/mappers/service_mapper.js +++ b/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', http://git-wip-us.apache.org/repos/asf/ambari/blob/e6bc8445/ambari-web/app/models/service/hdfs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/service/hdfs.js b/ambari-web/app/models/service/hdfs.js index be84894..2f3871f 100644 --- a/ambari-web/app/models/service/hdfs.js +++ b/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'), http://git-wip-us.apache.org/repos/asf/ambari/blob/e6bc8445/ambari-web/app/models/service/yarn.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/service/yarn.js b/ambari-web/app/models/service/yarn.js index fcc3355..831320c 100644 --- a/ambari-web/app/models/service/yarn.js +++ b/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'), http://git-wip-us.apache.org/repos/asf/ambari/blob/e6bc8445/ambari-web/app/views/main/dashboard/service/hdfs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/service/hdfs.js b/ambari-web/app/views/main/dashboard/service/hdfs.js index e48f82c..91560d5 100644 --- a/ambari-web/app/views/main/dashboard/service/hdfs.js +++ b/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"); http://git-wip-us.apache.org/repos/asf/ambari/blob/e6bc8445/ambari-web/app/views/main/dashboard/service/yarn.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/service/yarn.js b/ambari-web/app/views/main/dashboard/service/yarn.js index ec4d2ac..26d67fd 100644 --- a/ambari-web/app/views/main/dashboard/service/yarn.js +++ b/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"); http://git-wip-us.apache.org/repos/asf/ambari/blob/e6bc8445/ambari-web/app/views/main/dashboard/widgets/namenode_heap.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/widgets/namenode_heap.js b/ambari-web/app/views/main/dashboard/widgets/namenode_heap.js index c9942ed..941a6fb 100644 --- a/ambari-web/app/views/main/dashboard/widgets/namenode_heap.js +++ b/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', http://git-wip-us.apache.org/repos/asf/ambari/blob/e6bc8445/ambari-web/app/views/main/dashboard/widgets/resource_manager_heap.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/widgets/resource_manager_heap.js b/ambari-web/app/views/main/dashboard/widgets/resource_manager_heap.js index 33b9853..5910ffa 100644 --- a/ambari-web/app/views/main/dashboard/widgets/resource_manager_heap.js +++ b/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',
