You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/12/09 09:06:41 UTC
git commit: AMBARI-4012. NameNode max heap is not showing in HDP
1.3.2 stack. (xiwang via yusaku)
Updated Branches:
refs/heads/trunk c69c33c87 -> bf20cda0a
AMBARI-4012. NameNode max heap is not showing in HDP 1.3.2 stack. (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/bf20cda0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bf20cda0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bf20cda0
Branch: refs/heads/trunk
Commit: bf20cda0a14451d297c2bd8fc3e21c63e14fb9ce
Parents: c69c33c
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Mon Dec 9 00:07:42 2013 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Mon Dec 9 00:07:42 2013 -0800
----------------------------------------------------------------------
ambari-web/app/controllers/global/update_controller.js | 3 ++-
ambari-web/app/mappers/service_metrics_mapper.js | 8 ++++----
ambari-web/app/views/main/dashboard/service/hdfs.js | 6 +++---
ambari-web/app/views/main/dashboard/service/yarn.js | 7 +++----
.../app/views/main/dashboard/widgets/jobtracker_heap.js | 8 ++++++++
ambari-web/app/views/main/dashboard/widgets/namenode_heap.js | 8 ++++++++
.../app/views/main/dashboard/widgets/pie_chart_widget.js | 4 ++--
.../views/main/dashboard/widgets/resource_manager_heap.js | 8 ++++++++
8 files changed, 38 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf20cda0/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 8dd7bc0..5bb518e 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/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,' +
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf20cda0/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 99b6e5c..ff190df 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/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',
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf20cda0/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 91560d5..ec19434 100644
--- a/ambari-web/app/views/main/dashboard/service/hdfs.js
+++ b/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 () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf20cda0/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 f834061..2f792d3 100644
--- a/ambari-web/app/views/main/dashboard/service/yarn.js
+++ b/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 () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf20cda0/ambari-web/app/views/main/dashboard/widgets/jobtracker_heap.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/dashboard/widgets/jobtracker_heap.js b/ambari-web/app/views/main/dashboard/widgets/jobtracker_heap.js
index 3ea297e..a8996be 100644
--- a/ambari-web/app/views/main/dashboard/widgets/jobtracker_heap.js
+++ b/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();
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf20cda0/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 941a6fb..692796f 100644
--- a/ambari-web/app/views/main/dashboard/widgets/namenode_heap.js
+++ b/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();
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf20cda0/ambari-web/app/views/main/dashboard/widgets/pie_chart_widget.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/dashboard/widgets/pie_chart_widget.js b/ambari-web/app/views/main/dashboard/widgets/pie_chart_widget.js
index c6e9d07..2ad9444 100644
--- a/ambari-web/app/views/main/dashboard/widgets/pie_chart_widget.js
+++ b/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];
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf20cda0/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 5910ffa..4b28671 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
@@ -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();