[hbase] branch branch-2.5 updated: 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

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rajeshbabu pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.5 by this push:
     new 33872f77918 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
33872f77918 is described below

commit 33872f779182226318ec55544c89840b3bba173b
Author: Rajeshbabu Chintaguntla <ra...@apache.org>
AuthorDate: Thu Oct 6 16:41:20 2022 +0530

    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
---
 .../main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.java
index 5c2e42e6b8a..e8d09976b51 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.java
@@ -1342,7 +1342,8 @@ public abstract class HFileReaderImpl implements HFile.Reader, Configurable {
         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) {