From aa6b87eba45e34f14b08c357853b5a66e96ba64f Mon Sep 17 00:00:00 2001 From: Biju Nair Date: Sun, 5 May 2019 00:10:28 -0400 Subject: [PATCH] HBASE-22363 Remove hardcoded number of read cache block buckets --- .../java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java | 2 +- .../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java index ecbf37c78b..30bc9f42bc 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java @@ -693,7 +693,7 @@ public class LruBlockCache implements FirstLevelBlockCache { bucketQueue.add(bucketMulti); bucketQueue.add(bucketMemory); - int remainingBuckets = 3; + int remainingBuckets = bucketQueue.size(); BlockBucket bucket; while ((bucket = bucketQueue.poll()) != null) { diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java index 1c418f5a3b..2be408de5b 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java @@ -831,7 +831,7 @@ public class BucketCache implements BlockCache, HeapSize { bucketQueue.add(bucketMulti); bucketQueue.add(bucketMemory); - int remainingBuckets = 3; + int remainingBuckets = bucketQueue.size(); long bytesFreed = 0; BucketEntryGroup bucketGroup; -- 2.20.1 (Apple Git-117)