diff --git hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon index c051743..a62d5eb 100644 --- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon +++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon @@ -29,6 +29,7 @@ HMaster master; org.apache.hadoop.hbase.ServerLoad; org.apache.hadoop.hbase.ServerName; org.apache.hadoop.hbase.util.VersionInfo; + org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix; @@ -148,9 +149,12 @@ for (ServerName serverName: serverNames) { <& serverNameLink; serverName=serverName; serverLoad = sl; &> - <% sl.getUsedHeapMB() %>m - <% sl.getMaxHeapMB() %>m - <% sl.getMemstoreSizeInMB() %>m + <% TraditionalBinaryPrefix.long2String(sl.getUsedHeapMB() + * TraditionalBinaryPrefix.MEGA.value, "B", 1) %> + <% TraditionalBinaryPrefix.long2String(sl.getMaxHeapMB() + * TraditionalBinaryPrefix.MEGA.value, "B", 1) %> + <% TraditionalBinaryPrefix.long2String(sl.getMemstoreSizeInMB() + * TraditionalBinaryPrefix.MEGA.value, "B", 1) %> <%java> @@ -226,10 +230,14 @@ if (sl != null) { <& serverNameLink; serverName=serverName; serverLoad = sl; &> <% sl.getStores() %> <% sl.getStorefiles() %> -<% sl.getStoreUncompressedSizeMB() %>m -<% sl.getStorefileSizeInMB() %>mb -<% sl.getTotalStaticIndexSizeKB() %>k -<% sl.getTotalStaticBloomSizeKB() %>k +<% TraditionalBinaryPrefix.long2String( + sl.getStoreUncompressedSizeMB() * TraditionalBinaryPrefix.MEGA.value, "B", 1) %> +<% TraditionalBinaryPrefix.long2String(sl.getStorefileSizeInMB() + * TraditionalBinaryPrefix.MEGA.value, "B", 1) %> +<% TraditionalBinaryPrefix.long2String(sl.getTotalStaticIndexSizeKB() + * TraditionalBinaryPrefix.KILO.value, "B", 1) %> +<% TraditionalBinaryPrefix.long2String(sl.getTotalStaticBloomSizeKB() + * TraditionalBinaryPrefix.KILO.value, "B", 1) %> <%java> } else { diff --git hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon index 3dcd5e2..1277acc 100644 --- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon +++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon @@ -45,7 +45,7 @@ org.apache.hadoop.hbase.io.hfile.bucket.BucketCacheStats; org.apache.hadoop.hbase.io.hfile.bucket.BucketCache; org.apache.hadoop.hbase.io.hfile.bucket.BucketAllocator; org.apache.hadoop.hbase.io.hfile.bucket.BucketAllocator.Bucket; -org.apache.hadoop.util.StringUtils; +org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix;