You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2017/08/23 01:01:50 UTC
hbase git commit: HBASE-18614 Setting BUCKET_CACHE_COMBINED_KEY to
false disables stats on RS UI
Repository: hbase
Updated Branches:
refs/heads/master 51d458872 -> 3be5e8ce0
HBASE-18614 Setting BUCKET_CACHE_COMBINED_KEY to false disables stats on RS UI
Signed-off-by: tedyu <yu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3be5e8ce
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3be5e8ce
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3be5e8ce
Branch: refs/heads/master
Commit: 3be5e8ce00d04d31ee8109e51eb02864e67e4286
Parents: 51d4588
Author: Biju Nair <gs...@gmail.com>
Authored: Fri Aug 18 16:13:13 2017 -0400
Committer: tedyu <yu...@gmail.com>
Committed: Tue Aug 22 18:01:43 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java | 4 ++++
.../apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3be5e8ce/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
----------------------------------------------------------------------
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 c187022..dbb0d49 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
@@ -45,6 +45,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 org.apache.hadoop.hbase.shaded.com.google.common.annotations.VisibleForTesting;
@@ -1161,7 +1162,10 @@ public class LruBlockCache implements ResizableBlockCache, HeapSize {
}
@Override
+ @JsonIgnore
public BlockCache[] getBlockCaches() {
+ if (victimHandler != null)
+ return new BlockCache[] {this, this.victimHandler};
return null;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/3be5e8ce/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java
----------------------------------------------------------------------
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 5651c13..f07cc37 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
@@ -119,7 +119,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());
}
}
}