Repository: hbase Updated Branches: refs/heads/0.98 5133a8b3c -> e13054298
HBASE-15976 RegionServerMetricsWrapperRunnable will be failure when disable blockcache. - Addendum Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e1305429 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e1305429 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e1305429 Branch: refs/heads/0.98 Commit: e13054298351d53529649bfdeb5f3b4724bad4d8 Parents: 5133a8b Author: Jingcheng Du <[email protected]> Authored: Wed Jun 29 16:42:54 2016 +0800 Committer: Jingcheng Du <[email protected]> Committed: Wed Jun 29 16:42:54 2016 +0800 ---------------------------------------------------------------------- .../hbase/regionserver/MetricsRegionServerWrapperImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e1305429/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java index 9e29c6b..d08dc9c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java @@ -279,6 +279,9 @@ class MetricsRegionServerWrapperImpl @Override public long getBlockCacheFailedInsertions() { + if (this.cacheStats == null) { + return 0; + } return this.cacheStats.getFailedInserts(); } @@ -441,7 +444,6 @@ class MetricsRegionServerWrapperImpl @Override synchronized public void run() { initBlockCache(); - cacheStats = blockCache.getStats(); HDFSBlocksDistribution hdfsBlocksDistribution = new HDFSBlocksDistribution();
