Repository: hbase Updated Branches: refs/heads/branch-1 96a24aede -> b93c08d35
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/b93c08d3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b93c08d3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b93c08d3 Branch: refs/heads/branch-1 Commit: b93c08d358392de7617d2ae5ed50671293fc2954 Parents: 96a24ae Author: Jingcheng Du <[email protected]> Authored: Wed Jun 29 16:37:23 2016 +0800 Committer: Jingcheng Du <[email protected]> Committed: Wed Jun 29 16:37:23 2016 +0800 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b93c08d3/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 7e6d87c..35fd1ae 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 @@ -317,6 +317,9 @@ class MetricsRegionServerWrapperImpl @Override public long getBlockCacheFailedInsertions() { + if (this.cacheStats == null) { + return 0; + } return this.cacheStats.getFailedInserts(); }
