diff --git a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java index f1c9ea8..162e5b5 100644 --- a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java +++ b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java @@ -113,17 +113,17 @@ public interface MetricsRegionServerWrapper { long getCheckAndMutateChecksPassed(); /** - * Get the Size of indexes in storefiles on disk. + * Get the Size (in bytes) of indexes in storefiles on disk. */ long getStoreFileIndexSize(); /** - * Get the size of of the static indexes including the roots. + * Get the size (in bytes) of of the static indexes including the roots. */ long getTotalStaticIndexSize(); /** - * Get the size of the static bloom filters. + * Get the size (in bytes) of the static bloom filters. */ long getTotalStaticBloomSize(); @@ -158,7 +158,7 @@ public interface MetricsRegionServerWrapper { int getFlushQueueSize(); /** - * Get the size of the block cache that is free. + * Get the size (in bytes) of the block cache that is free. */ long getBlockCacheFreeSize(); @@ -168,7 +168,7 @@ public interface MetricsRegionServerWrapper { long getBlockCacheCount(); /** - * Get the total size of the block cache. + * Get the total size (in bytes) of the block cache. */ long getBlockCacheSize(); 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 6698771..ff371fd 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 @@ -120,16 +120,16 @@ MetricsRegionServerWrapper mWrap; Num. Stores Num. Storefiles - Root Index Size - Index Size - Bloom Size + Root Index Size (bytes) + Index Size (bytes) + Bloom Size (bytes) - <% mWrap.getNumStores() %> - <% mWrap.getNumStoreFiles() %> - <% mWrap.getStoreFileIndexSize() %> - <% mWrap.getTotalStaticIndexSize() %> - <% mWrap.getTotalStaticBloomSize() %> + <% StringUtils.humanReadableInt(mWrap.getNumStores()) %> + <% StringUtils.humanReadableInt(mWrap.getNumStoreFiles()) %> + <% StringUtils.humanReadableInt(mWrap.getStoreFileIndexSize()) %> + <% StringUtils.humanReadableInt(mWrap.getTotalStaticIndexSize()) %> + <% StringUtils.humanReadableInt(mWrap.getTotalStaticBloomSize()) %> @@ -159,8 +159,8 @@ MetricsRegionServerWrapper mWrap; - - + + @@ -177,23 +177,23 @@ MetricsRegionServerWrapper mWrap;
Compaction queue sizeFlush queue sizeCompaction Queue SizeFlush Queue Size
- - - - - + + + + + - - - - - + + + + + - +
Cache SizeCache FreeCache CountCache HitsCache MissesCache Size (byte)Cache Free (bytes)Cache Count (blocks)Cache Hit CountCache Miss Count Cache Hit Ratio Cache Eviction Count
<% mWrap.getBlockCacheSize()%><% mWrap.getBlockCacheFreeSize()%><% mWrap.getBlockCacheCount() %><% mWrap.getBlockCacheHitCount() %><% mWrap.getBlockCacheMissCount() %><% StringUtils.humanReadableInt(mWrap.getBlockCacheSize()) %><% StringUtils.humanReadableInt(mWrap.getBlockCacheFreeSize()) %><% StringUtils.humanReadableInt(mWrap.getBlockCacheCount()) %><% StringUtils.humanReadableInt(mWrap.getBlockCacheHitCount()) %><% StringUtils.humanReadableInt(mWrap.getBlockCacheMissCount()) %> <% mWrap.getBlockCacheHitPercent() %>%<% mWrap.getBlockCacheEvictedCount() %><% StringUtils.humanReadableInt(mWrap.getBlockCacheEvictedCount()) %>