diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
index b064d49..9230e12 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon
@@ -142,9 +142,9 @@ for (ServerName serverName: serverNames) {
%java>
| <& serverNameLink; serverName=serverName; serverLoad = sl; &> |
- <% sl.getUsedHeapMB() %>MB |
- <% sl.getMaxHeapMB() %>MB |
- <% sl.getMemstoreSizeInMB() %>MB |
+ <% sl.getUsedHeapMB() %>m |
+ <% sl.getMaxHeapMB() %>m |
+ <% sl.getMemstoreSizeInMB() %>m |
<%java>
@@ -218,10 +218,10 @@ if (sl != null) {
<& serverNameLink; serverName=serverName; serverLoad = sl; &> |
<% sl.getStores() %> |
<% sl.getStorefiles() %> |
-<% sl.getStoreUncompressedSizeMB() %>MB |
-<% sl.getStorefileSizeInMB() %>MB |
-<% sl.getTotalStaticIndexSizeKB() %>KB |
-<% sl.getTotalStaticBloomSizeKB() %>KB |
+<% sl.getStoreUncompressedSizeMB() %>m |
+<% sl.getStorefileSizeInMB() %>mb |
+<% sl.getTotalStaticIndexSizeKB() %>k |
+<% sl.getTotalStaticBloomSizeKB() %>k |
<%java>
} else {
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
index 4536aea..eddb1c1 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
@@ -152,10 +152,10 @@
<%if load != null %>
<% load.getStores() %> |
<% load.getStorefiles() %> |
- <% load.getStoreUncompressedSizeMB() %>MB |
- <% load.getStorefileSizeMB() %>MB |
- <% load.getTotalStaticIndexSizeKB() %>KB |
- <% load.getTotalStaticBloomSizeKB() %>KB |
+ <% load.getStoreUncompressedSizeMB() %>m |
+ <% load.getStorefileSizeMB() %>m |
+ <% load.getTotalStaticIndexSizeKB() %>k |
+ <% load.getTotalStaticBloomSizeKB() %>k |
%if>
%for>
@@ -215,7 +215,7 @@
%java>
<% r.getRegionNameAsString() %> |
<%if load != null %>
- <% load.getMemstoreSizeMB() %>MB |
+ <% load.getMemstoreSizeMB() %>m |
%if>
%for>
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
index 9509897..22cf438 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
@@ -31,6 +31,7 @@ org.apache.hadoop.hbase.protobuf.ProtobufUtil;
org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo;
org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad;
org.apache.hadoop.hbase.metrics.histogram.MetricsHistogram;
+org.apache.hadoop.util.StringUtils;
com.yammer.metrics.stats.Snapshot;
java.lang.management.ManagementFactory;
%import>
@@ -100,12 +101,12 @@ MetricsRegionServerWrapper mWrap;
|
- <% ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() %>
+ <% StringUtils.humanReadableInt(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed()) %>
|
- <% ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax()%>
+ <% StringUtils.humanReadableInt(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax()) %>
|
- <% mWrap.getMemstoreSize() %> |
+ <% StringUtils.humanReadableInt(mWrap.getMemstoreSize()) %> |
%def>
@@ -147,7 +148,7 @@ MetricsRegionServerWrapper mWrap;
| <% mWrap.getRequestsPerSecond() %> |
<% mWrap.getReadRequestsCount() %> |
- <% mWrap.getWriteRequestsCount() %>KB |
+ <% mWrap.getWriteRequestsCount() %> |
%def>
@@ -195,4 +196,4 @@ MetricsRegionServerWrapper mWrap;
<% mWrap.getBlockCacheEvictedCount() %> |
-%def>
\ No newline at end of file
+%def>