From 8e9b504ffebf92001389d336b9a1a10e250451f2 Mon Sep 17 00:00:00 2001
From: binlijin <binlijin@apache.org>
Date: Mon, 27 May 2019 17:14:42 +0800
Subject: [PATCH] HBASE-22441 BucketCache NullPointerException in cacheBlock

---
 .../java/org/apache/hadoop/hbase/io/hfile/BlockCacheUtil.java | 4 ++++
 1 file changed, 4 insertions(+)

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
index 36f9e61809c..397b4897747 100644
--- 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
@@ -227,6 +227,10 @@ public class BlockCacheUtil {
   public static boolean shouldReplaceExistingCacheBlock(BlockCache blockCache,
       BlockCacheKey cacheKey, Cacheable newBlock) {
     Cacheable existingBlock = blockCache.getBlock(cacheKey, false, false, false);
+    if (null == existingBlock) {
+      // Not exist now.
+      return true;
+    }
     try {
       int comparison = BlockCacheUtil.validateBlockAddition(existingBlock, newBlock, cacheKey);
       if (comparison < 0) {