(hbase) branch branch-2.6 updated: [ADDENDUM] HBASE-28596 Optimise BucketCache usage upon regions splits/merges. (#7141)

[wchevreuil]

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

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


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new f2d74f4c5d3 [ADDENDUM] HBASE-28596 Optimise BucketCache usage upon 
regions splits/merges. (#7141)
f2d74f4c5d3 is described below

commit f2d74f4c5d30b6c9765964d32255d730846a8d6f
Author: Wellington Ramos Chevreuil <wchevre...@apache.org>
AuthorDate: Wed Jul 9 11:49:52 2025 +0100

    [ADDENDUM] HBASE-28596 Optimise BucketCache usage upon regions 
splits/merges. (#7141)
    
    # The merge of HBASE-28596 on branch-2.6 has broken HBASE-29243. This 
addendum commit fixes this issue.
    
    Signed-off-by: Dávid Paksy <pak...@apache.org>
    Reviewed-by: Rahul Agarkar <ragar...@cloudera.com>
---
 .../main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
index 215599e419e..28b2b05936c 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
@@ -2268,7 +2268,7 @@ public class BucketCache implements BlockCache, HeapSize {
         ReentrantReadWriteLock lock = offsetLock.getLock(entry.getOffset());
         lock.readLock().lock();
         locks.add(lock);
-        if (backingMap.containsKey(entry) && entry.getBlockType() == 
BlockType.DATA) {
+        if (backingMap.containsKey(entry) && entry.getBlockType().isData()) {
           count.increment();
         }
       });