You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2014/11/07 17:28:00 UTC
ambari git commit: AMBARI-8208 HBase Memstore Sizes Heatmap reports
really large size (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 14f19ed1e -> 618f321f1
AMBARI-8208 HBase Memstore Sizes Heatmap reports really large size (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/618f321f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/618f321f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/618f321f
Branch: refs/heads/branch-1.7.0
Commit: 618f321f10e74ea29328fbc93f6fe360d8a629ec
Parents: 14f19ed
Author: Dmytro Sen <ds...@apache.org>
Authored: Fri Nov 7 18:27:57 2014 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Fri Nov 7 18:27:57 2014 +0200
----------------------------------------------------------------------
.../stacks/BIGTOP/0.8/services/HBASE/metrics.json | 18 +++++++++---------
.../stacks/HDP/2.0.6/services/HBASE/metrics.json | 12 ++++++------
.../heatmap_metric_hbase_memstoresize.js | 16 ++++++++++++----
3 files changed, 27 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/618f321f/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/metrics.json b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/metrics.json
index 37f73bf..a3fce53 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/metrics.json
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/metrics.json
@@ -1904,11 +1904,11 @@
"pointInTime": false,
"temporal": true
},
- "metrics/hbase/regionserver/memstoreSizeMB": {
+ "metrics/hbase/regionserver/memstoreSize": {
"metric": "regionserver.Server.memStoreSize",
"pointInTime": false,
"temporal": true
- },
+ },
"metrics/hbase/regionserver/fsReadLatencyHistogram_median": {
"metric": "hbase.regionserver.fsReadLatencyHistogram_median",
"pointInTime": true,
@@ -2154,11 +2154,11 @@
"pointInTime": true,
"temporal": false
},
- "metrics/hbase/regionserver/memstoreSizeMB": {
+ "metrics/hbase/regionserver/memstoreSize": {
"metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.memStoreSize",
"pointInTime": true,
"temporal": false
- },
+ },
"metrics/hbase/regionserver/getRequestLatency_max": {
"metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.Get_max",
"pointInTime": true,
@@ -3956,11 +3956,11 @@
"pointInTime": false,
"temporal": true
},
- "metrics/hbase/regionserver/memstoreSizeMB": {
+ "metrics/hbase/regionserver/memstoreSize": {
"metric": "regionserver.Server.memStoreSize",
"pointInTime": false,
"temporal": true
- },
+ },
"metrics/hbase/regionserver/fsReadLatencyHistogram_median": {
"metric": "hbase.regionserver.fsReadLatencyHistogram_median",
"pointInTime": true,
@@ -4271,11 +4271,11 @@
"pointInTime": true,
"temporal": false
},
- "metrics/hbase/regionserver/memstoreSizeMB": {
+ "metrics/hbase/regionserver/memstoreSize": {
"metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.memStoreSize",
"pointInTime": true,
"temporal": false
- },
+ },
"metrics/hbase/regionserver/getRequestLatency_max": {
"metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.Get_max",
"pointInTime": true,
@@ -13632,4 +13632,4 @@
}
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/618f321f/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metrics.json b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metrics.json
index 37f73bf..50f9c42 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metrics.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/metrics.json
@@ -1904,7 +1904,7 @@
"pointInTime": false,
"temporal": true
},
- "metrics/hbase/regionserver/memstoreSizeMB": {
+ "metrics/hbase/regionserver/memstoreSize": {
"metric": "regionserver.Server.memStoreSize",
"pointInTime": false,
"temporal": true
@@ -2154,7 +2154,7 @@
"pointInTime": true,
"temporal": false
},
- "metrics/hbase/regionserver/memstoreSizeMB": {
+ "metrics/hbase/regionserver/memstoreSize": {
"metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.memStoreSize",
"pointInTime": true,
"temporal": false
@@ -3956,7 +3956,7 @@
"pointInTime": false,
"temporal": true
},
- "metrics/hbase/regionserver/memstoreSizeMB": {
+ "metrics/hbase/regionserver/memstoreSize": {
"metric": "regionserver.Server.memStoreSize",
"pointInTime": false,
"temporal": true
@@ -4271,11 +4271,11 @@
"pointInTime": true,
"temporal": false
},
- "metrics/hbase/regionserver/memstoreSizeMB": {
+ "metrics/hbase/regionserver/memstoreSize": {
"metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.memStoreSize",
"pointInTime": true,
"temporal": false
- },
+ },
"metrics/hbase/regionserver/getRequestLatency_max": {
"metric": "Hadoop:service=HBase,name=RegionServer,sub=Server.Get_max",
"pointInTime": true,
@@ -13632,4 +13632,4 @@
}
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/618f321f/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_hbase_memstoresize.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_hbase_memstoresize.js b/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_hbase_memstoresize.js
index 9f9bb73..7764ff1 100644
--- a/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_hbase_memstoresize.js
+++ b/ambari-web/app/controllers/main/charts/heatmap_metrics/heatmap_metric_hbase_memstoresize.js
@@ -22,8 +22,16 @@ var App = require('app');
*/
App.MainChartHeatmapHbaseMemStoreSize = App.MainChartHeatmapHbaseMetrics.extend({
name: Em.I18n.t('charts.heatmap.metrics.HbaseRegionServerMemStoreSize'),
- maximumValue: 100,
- defaultMetric: 'metrics.hbase.regionserver.memstoreSizeMB',
- units: 'MB',
- slotDefinitionLabelSuffix: 'MB'
+ maximumValue: function() {
+ return App.get('isHadoop2Stack') ? 100*1024*1024 : 100;
+ }.property('App.isHadoop2Stack'),
+ defaultMetric: function() {
+ return App.get('isHadoop2Stack') ? 'metrics.hbase.regionserver.memstoreSize' : 'metrics.hbase.regionserver.memstoreSizeMB';
+ }.property('App.isHadoop2Stack'),
+ units: function() {
+ return App.get('isHadoop2Stack') ? 'B' : 'MB';
+ }.property('App.isHadoop2Stack'),
+ slotDefinitionLabelSuffix: function() {
+ return App.get('isHadoop2Stack') ? 'B' : 'MB';
+ }.property('App.isHadoop2Stack')
});
\ No newline at end of file