diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java index f427e0466dc..334e848064d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java @@ -46,6 +46,7 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ClassSize; import org.apache.hadoop.hbase.util.HasThread; import org.apache.hadoop.util.StringUtils; +import org.codehaus.jackson.annotate.JsonIgnore; import org.codehaus.jackson.annotate.JsonIgnoreProperties; import com.google.common.annotations.VisibleForTesting; @@ -1152,7 +1153,10 @@ public class LruBlockCache implements ResizableBlockCache, HeapSize { } @Override + @JsonIgnore public BlockCache[] getBlockCaches() { + if (victimHandler != null) + return new BlockCache[] {this, this.victimHandler}; return null; } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java index 3b9161cddff..7ce96796adc 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java @@ -118,7 +118,7 @@ public class TestBlockCacheReporting { BlockCache [] bcs = bc.getBlockCaches(); if (bcs != null) { for (BlockCache sbc: bc.getBlockCaches()) { - bucketCacheReport(sbc); + LOG.info(bc.getClass().getSimpleName() + ": " + sbc.getStats()); } } } @@ -156,4 +156,4 @@ public class TestBlockCacheReporting { } return cbsbf; } -} \ No newline at end of file +}