@@ -245,12 +245,14 @@ org.apache.hadoop.util.StringUtils;
| Size |
- <% StringUtils.humanReadableInt(cacheConfig.getBlockCache().getCurrentSize()) %> |
+ <% TraditionalBinaryPrefix.long2String(cacheConfig.getBlockCache().getCurrentSize(),
+ "B", 1) %> |
Current size of block cache in use (bytes) |
| Free |
- <% StringUtils.humanReadableInt(cacheConfig.getBlockCache().getFreeSize()) %> |
+ <% TraditionalBinaryPrefix.long2String(cacheConfig.getBlockCache().getFreeSize(),
+ "B", 1) %> |
The total free memory currently available to store more cache entries (bytes) |
@@ -337,13 +339,13 @@ are combined counts. Request count is sum of hits and misses.
%if>
| Size |
- <% StringUtils.humanReadableInt(cbsbf.getSize()) %> |
+ <% TraditionalBinaryPrefix.long2String(cbsbf.getSize(), "B", 1) %> |
Size of Blocks |
<%if !bucketCache %>
| Size |
- <% StringUtils.humanReadableInt(cbsbf.getDataSize()) %> |
+ <% TraditionalBinaryPrefix.long2String(cbsbf.getDataSize(), "B", 1) %> |
Size of DATA Blocks |
%if>
diff --git hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
index cefd476..a239bef 100644
--- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
+++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon
@@ -33,6 +33,7 @@
org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad;
org.apache.hadoop.hbase.client.RegionReplicaUtil;
org.apache.hadoop.hbase.regionserver.MetricsRegionWrapper;
+ org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix;
%import>
<%if (onlineRegions != null && onlineRegions.size() > 0) %>
@@ -170,10 +171,14 @@
<%if load != null %>
<% load.getStores() %> |
<% load.getStorefiles() %> |
- <% load.getStoreUncompressedSizeMB() %>m |
- <% load.getStorefileSizeMB() %>m |
- <% load.getTotalStaticIndexSizeKB() %>k |
- <% load.getTotalStaticBloomSizeKB() %>k |
+ <% TraditionalBinaryPrefix.long2String(load.getStoreUncompressedSizeMB()
+ * TraditionalBinaryPrefix.MEGA.value, "B", 1)%> |
+ <% TraditionalBinaryPrefix.long2String(load.getStorefileSizeMB()
+ * TraditionalBinaryPrefix.MEGA.value, "B", 1) %> |
+ <% TraditionalBinaryPrefix.long2String(load.getTotalStaticIndexSizeKB()
+ * TraditionalBinaryPrefix.KILO.value, "B", 1) %> |
+ <% TraditionalBinaryPrefix.long2String(load.getTotalStaticBloomSizeKB()
+ * TraditionalBinaryPrefix.KILO.value, "B", 1) %> |
<% load.getDataLocality() %> |
%if>
@@ -238,7 +243,8 @@
%java>
<% displayName %> |
<%if load != null %>
- <% load.getMemstoreSizeMB() %>m |
+ <% TraditionalBinaryPrefix.long2String(
+ load.getMemstoreSizeMB() * TraditionalBinaryPrefix.MEGA.value, "B", 1) %> |
%if>
%for>
diff --git hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
index de2aeca..f5aa478 100644
--- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
+++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon
@@ -33,7 +33,7 @@ org.apache.hadoop.hbase.protobuf.ProtobufUtil;
org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo;
org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad;
org.apache.hadoop.hbase.util.DirectMemoryUtils;
-org.apache.hadoop.util.StringUtils;
+org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix;
java.lang.management.ManagementFactory;
%import>
@@ -106,18 +106,20 @@ MetricsRegionServerWrapper mWrap;
|
- <% StringUtils.humanReadableInt(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed()) %>
+ <% TraditionalBinaryPrefix.long2String(
+ ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed(), "B", 1) %>
|
- <% StringUtils.humanReadableInt(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax()) %>
+ <% TraditionalBinaryPrefix.long2String(
+ ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax(), "B", 1) %>
|
- <% StringUtils.humanReadableInt(DirectMemoryUtils.getDirectMemoryUsage()) %>
+ <% TraditionalBinaryPrefix.long2String(DirectMemoryUtils.getDirectMemoryUsage(), "B", 1) %>
|
- <% StringUtils.humanReadableInt(DirectMemoryUtils.getDirectMemorySize()) %>
+ <% TraditionalBinaryPrefix.long2String(DirectMemoryUtils.getDirectMemorySize(), "B", 1) %>
|
- <% StringUtils.humanReadableInt(mWrap.getMemstoreSize()) %> |
+ <% TraditionalBinaryPrefix.long2String(mWrap.getMemstoreSize(), "B", 1) %> |
%def>
@@ -135,7 +137,7 @@ MetricsRegionServerWrapper mWrap;
| <% mWrap.getNumWALFiles() %> |
- <% mWrap.getWALFileSize() %> |
+ <% TraditionalBinaryPrefix.long2String(mWrap.getWALFileSize(), "B", 1) %> |
%def>
@@ -154,11 +156,11 @@ MetricsRegionServerWrapper mWrap;
Bloom Size (bytes) |
- | <% StringUtils.humanReadableInt(mWrap.getNumStores()) %> |
- <% StringUtils.humanReadableInt(mWrap.getNumStoreFiles()) %> |
- <% StringUtils.humanReadableInt(mWrap.getStoreFileIndexSize()) %> |
- <% StringUtils.humanReadableInt(mWrap.getTotalStaticIndexSize()) %> |
- <% StringUtils.humanReadableInt(mWrap.getTotalStaticBloomSize()) %> |
+ <% mWrap.getNumStores() %> |
+ <% mWrap.getNumStoreFiles() %> |
+ <% TraditionalBinaryPrefix.long2String(mWrap.getStoreFileIndexSize(), "B", 1) %> |
+ <% TraditionalBinaryPrefix.long2String(mWrap.getTotalStaticIndexSize(), "B", 1) %> |
+ <% TraditionalBinaryPrefix.long2String(mWrap.getTotalStaticBloomSize(), "B", 1) %> |
%def>
@@ -199,8 +201,7 @@ MetricsHBaseServerWrapper mServerWrap;
| <% mWrap.getCompactionQueueSize() %> |
<% mWrap.getFlushQueueSize() %> |
- <% StringUtils.TraditionalBinaryPrefix.long2String(mServerWrap.getTotalQueueSize(),
- "", 1) %> |
+ <% TraditionalBinaryPrefix.long2String(mServerWrap.getTotalQueueSize(), "B", 1) %> |
%def>