HBASE-27365 Minimise block addition failures due to no space in bucket cache writers queue by introducing wait time - addendum added mistakenly removed in-memory flag

Author: chrajeshbabu

hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.java

@@ -1342,7 +1342,8 @@ public HFileBlock readBlock(long dataBlockOffset, long onDiskBlockSize, final bo
         cacheConf.getBlockCache().ifPresent(cache -> {
           if (cacheBlock && cacheConf.shouldCacheBlockOnRead(category)) {
             // Using the wait on cache during compaction and prefetching.
-            cache.cacheBlock(cacheKey, cacheCompressed ? hfileBlock : unpacked, cacheOnly);
+            cache.cacheBlock(cacheKey, cacheCompressed ? hfileBlock : unpacked,
+              cacheConf.isInMemory(), cacheOnly);
           }
         });
         if (unpacked != hfileBlock) {

hbase-server/src/test/resources/hbase-site.xml

@@ -279,7 +279,7 @@
   </property>
   <property>
     <name>hbase.bucketcache.queue.addition.waittime</name>
-    <value>100</value>
+    <value>1000</value>
     <description>Default is 0</description>
   </property>
 </configuration>