HBASE-23375 HBASE-22441 BucketCache NullPointerException in cacheBlock

branches-1 backport. closes #907 Co-authored-by: binlijin <[email protected]> Signed-off-by: binlijin <[email protected]> Signed-off-by: Viraj Jasani <[email protected]> Signed-off-by: Sean Busbey <[email protected]>
apache · Dec 13, 2019 · 28673f0 · 28673f0
1 parent 84c0a90
commit 28673f0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java
@@ -230,6 +230,9 @@ public static int validateBlockAddition(Cacheable existing, Cacheable newBlock,
   public static boolean shouldReplaceExistingCacheBlock(BlockCache blockCache,
       BlockCacheKey cacheKey, Cacheable newBlock) {
     Cacheable existingBlock = blockCache.getBlock(cacheKey, false, false, false);
+    if (existingBlock == null) {
+      return true;
+    }
     int comparison = BlockCacheUtil.validateBlockAddition(existingBlock, newBlock, cacheKey);
     if (comparison < 0) {
       LOG.warn("Cached block contents differ by nextBlockOnDiskSize, the new block has "