Author: stack Date: Tue Jun 11 18:53:34 2013 New Revision: 1491903 URL: http://svn.apache.org/r1491903 Log: HBASE-8664 Small fix ups for memory size outputs in UI
Modified: hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon Modified: hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon?rev=1491903&r1=1491902&r2=1491903&view=diff ============================================================================== --- hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon (original) +++ hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionServerListTmpl.jamon Tue Jun 11 18:53:34 2013 @@ -142,9 +142,9 @@ for (ServerName serverName: serverNames) </%java> <tr> <td><& serverNameLink; serverName=serverName; serverLoad = sl; &></td> - <td><% sl.getUsedHeapMB() %>MB</td> - <td><% sl.getMaxHeapMB() %>MB</td> - <td><% sl.getMemstoreSizeInMB() %>MB</td> + <td><% sl.getUsedHeapMB() %>m</td> + <td><% sl.getMaxHeapMB() %>m</td> + <td><% sl.getMemstoreSizeInMB() %>m</td> </tr> <%java> @@ -218,10 +218,10 @@ if (sl != null) { <td><& serverNameLink; serverName=serverName; serverLoad = sl; &></td> <td><% sl.getStores() %></td> <td><% sl.getStorefiles() %></td> -<td><% sl.getStoreUncompressedSizeMB() %>MB</td> -<td><% sl.getStorefileSizeInMB() %>MB</td> -<td><% sl.getTotalStaticIndexSizeKB() %>KB</td> -<td><% sl.getTotalStaticBloomSizeKB() %>KB</td> +<td><% sl.getStoreUncompressedSizeMB() %>m</td> +<td><% sl.getStorefileSizeInMB() %>mb</td> +<td><% sl.getTotalStaticIndexSizeKB() %>k</td> +<td><% sl.getTotalStaticBloomSizeKB() %>k</td> </tr> <%java> } else { Modified: hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon?rev=1491903&r1=1491902&r2=1491903&view=diff ============================================================================== --- hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon (original) +++ hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RegionListTmpl.jamon Tue Jun 11 18:53:34 2013 @@ -152,10 +152,10 @@ <%if load != null %> <td><% load.getStores() %></td> <td><% load.getStorefiles() %></td> - <td><% load.getStoreUncompressedSizeMB() %>MB</td> - <td><% load.getStorefileSizeMB() %>MB</td> - <td><% load.getTotalStaticIndexSizeKB() %>KB</td> - <td><% load.getTotalStaticBloomSizeKB() %>KB</td> + <td><% load.getStoreUncompressedSizeMB() %>m</td> + <td><% load.getStorefileSizeMB() %>m</td> + <td><% load.getTotalStaticIndexSizeKB() %>k</td> + <td><% load.getTotalStaticBloomSizeKB() %>k</td> </%if> </tr> </%for> @@ -215,7 +215,7 @@ </%java> <td><% r.getRegionNameAsString() %></td> <%if load != null %> - <td><% load.getMemstoreSizeMB() %>MB</td> + <td><% load.getMemstoreSizeMB() %>m</td> </%if> </tr> </%for> Modified: hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon?rev=1491903&r1=1491902&r2=1491903&view=diff ============================================================================== --- hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon (original) +++ hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon Tue Jun 11 18:53:34 2013 @@ -31,6 +31,7 @@ org.apache.hadoop.hbase.protobuf.Protobu 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; </tr> <tr> <td> - <% ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() %> + <% StringUtils.humanReadableInt(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed()) %> </td> <td> - <% ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax()%> + <% StringUtils.humanReadableInt(ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax()) %> </td> - <td><% mWrap.getMemstoreSize() %></td> + <td><% StringUtils.humanReadableInt(mWrap.getMemstoreSize()) %></td> </tr> </table> </%def> @@ -147,7 +148,7 @@ MetricsRegionServerWrapper mWrap; <tr> <td><% mWrap.getRequestsPerSecond() %></td> <td><% mWrap.getReadRequestsCount() %></td> - <td><% mWrap.getWriteRequestsCount() %>KB</td> + <td><% mWrap.getWriteRequestsCount() %></td> </tr> </table> </%def> @@ -195,4 +196,4 @@ MetricsRegionServerWrapper mWrap; <td><% mWrap.getBlockCacheEvictedCount() %></td> </tr> </table> -</%def> \ No newline at end of file +</%def>