diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon
index 5e94279..1aed29a 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon
@@ -110,10 +110,10 @@ org.apache.hadoop.util.StringUtils;
| Implementation |
<% bcName %> |
- Block Cache implementing class |
+ Block cache implementing class |
-See Block Cache in the HBase Reference Guide for help.
+See block cache in the HBase Reference Guide for help.
%def>
<%def bc_config>
@@ -185,28 +185,28 @@ org.apache.hadoop.util.StringUtils;
| Size |
- <% StringUtils.humanReadableInt(cacheConfig.getBlockCache().size()) %> |
- Total size of Block Cache (bytes) |
+ <% StringUtils.humanReadableInt(cacheConfig.getBlockCache().getCurrentSize()) %> |
+ Current size of block cache in use (bytes) |
| Free |
<% StringUtils.humanReadableInt(cacheConfig.getBlockCache().getFreeSize()) %> |
- Free space in Block Cache (bytes) |
+ The total free memory currently available to store more cache entries (bytes) |
| Count |
<% String.format("%,d", cacheConfig.getBlockCache().getBlockCount()) %> |
- Number of blocks in Block Cache |
+ Number of blocks in block cache |
| Evicted |
<% String.format("%,d", cacheConfig.getBlockCache().getStats().getEvictedCount()) %> |
- Number of blocks evicted |
+ The total number of blocks evicted |
| Evictions |
<% String.format("%,d", cacheConfig.getBlockCache().getStats().getEvictionCount()) %> |
- Number of times an eviction occurred |
+ The total number of times an eviction has occurred |
| Hits |
@@ -216,17 +216,17 @@ org.apache.hadoop.util.StringUtils;
| Hits Caching |
<% String.format("%,d", cacheConfig.getBlockCache().getStats().getHitCachingCount()) %> |
- Cache hit block requests but only requests set to use Block Cache |
+ Cache hit block requests but only requests set to cache block if a miss |
| Misses |
<% String.format("%,d", cacheConfig.getBlockCache().getStats().getMissCount()) %> |
- Number of requests that were cache misses |
+ Block requests that were cache misses but set to cache missed blocks |
| Misses Caching |
<% String.format("%,d", cacheConfig.getBlockCache().getStats().getMissCount()) %> |
- Block requests that were cache misses but only requests set to use Block Cache |
+ Block requests that were cache misses but only requests set to use block cache |
| Hit Ratio |
@@ -234,7 +234,7 @@ org.apache.hadoop.util.StringUtils;
Hit Count divided by total requests count |
-If Block Cache is made up of more than one cache -- i.e. a L1 and a L2 -- then the above
+
If block cache is made up of more than one cache -- i.e. a L1 and a L2 -- then the above
are combined counts. Request count is sum of hits and misses.
%if>
%def>
@@ -292,7 +292,7 @@ are combined counts. Request count is sum of hits and misses.
| Implementation |
<% bc.getClass().getSimpleName() %> |
- Class implementing this Block Cache Level |
+ Class implementing this block cache Level |
<%if bucketCache %>
@@ -371,8 +371,8 @@ are combined counts. Request count is sum of hits and misses.
%if>
-<%doc>Call through to Block Cache Detail rendering template%doc>
-View Block Cache as JSON | Block Cache as JSON by file
+<%doc>Call through to block cache Detail rendering template%doc>
+View block cache as JSON | Block cache as JSON by file
<%if bucketCache %>
BucketCache does not discern between DATA and META blocks so we do not show DATA counts (If deploy is using CombinedBlockCache, BucketCache is only DATA blocks
BucketCache Buckets