Repository: hbase Updated Branches: refs/heads/branch-1 af141f2b0 -> cfa3ad4c2
HBASE-11559 Add dumping of DATA block usage to the BlockCache JSON report Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cfa3ad4c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cfa3ad4c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cfa3ad4c Branch: refs/heads/branch-1 Commit: cfa3ad4c277e388ea9497b9370c65fb6837d2589 Parents: af141f2 Author: stack <[email protected]> Authored: Tue Jul 22 10:21:37 2014 -0700 Committer: stack <[email protected]> Committed: Tue Jul 22 10:22:18 2014 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon | 10 ++++++++++ .../hbase/tmpl/regionserver/BlockCacheViewTmpl.jamon | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/cfa3ad4c/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheTmpl.jamon ---------------------------------------------------------------------- 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 80391b2..fa83fc3 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 @@ -318,6 +318,16 @@ are combined counts. Request count is sum of hits and misses.</p> <td>Size of DATA Blocks</td> </tr> </%if> + <tr> + <td>Evicted</td> + <td><% String.format("%,d", bc.getStats().getEvictedCount()) %></td> + <td>The total number of blocks evicted</td> + </tr> + <tr> + <td>Evictions</td> + <td><% String.format("%,d", bc.getStats().getEvictionCount()) %></td> + <td>The total number of times an eviction has occurred</td> + </tr> <tr> <td>Mean</td> http://git-wip-us.apache.org/repos/asf/hbase/blob/cfa3ad4c/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.jamon ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.jamon index d6a25ad..184076e 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/BlockCacheViewTmpl.jamon @@ -53,7 +53,7 @@ com.yammer.metrics.stats.Snapshot; } CachedBlocksByFile cbsbf = BlockCacheUtil.getLoadedCachedBlocksByFile(conf, bc); </%java> -<%if bcv.equals("file") %><& bc_by_file; cbsbf = cbsbf; &><%else><% BlockCacheUtil.toJSON(bc) %></%if> +<%if bcv.equals("file") %><& bc_by_file; cbsbf = cbsbf; &><%else>{<% BlockCacheUtil.toJSON(bc) %>, <% cbsbf %> }</%if> <%java> cbsbf = null; </%java>
