Repository: hbase Updated Branches: refs/heads/master 394e7224a -> 432868b03
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/432868b0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/432868b0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/432868b0 Branch: refs/heads/master Commit: 432868b0383669d11ddef77ed61942fdf9cd4294 Parents: 394e722 Author: Jingcheng Du <[email protected]> Authored: Wed Jun 29 16:31:23 2016 +0800 Committer: Jingcheng Du <[email protected]> Committed: Wed Jun 29 16:31:23 2016 +0800 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/432868b0/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 c2a3be8..d65365e 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 @@ -362,6 +362,9 @@ class MetricsRegionServerWrapperImpl @Override public long getBlockCacheFailedInsertions() { + if (this.cacheStats == null) { + return 0; + } return this.cacheStats.getFailedInserts(); }
