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 e7154e1c4c6 HBASE-29623 Blocks for CFs with BlockCache disabled may
still get cached on write or compaction (#7339)
e7154e1c4c6 is described below
commit e7154e1c4c664ecaa56f349cee0af8fb25945f7b
Author: Wellington Ramos Chevreuil <[email protected]>
AuthorDate: Thu Sep 25 10:44:48 2025 +0100
HBASE-29623 Blocks for CFs with BlockCache disabled may still get cached on
write or compaction (#7339)
Signed-off-by: Peter Somogyi <[email protected]>
Change-Id: If4e4efd89acec4fb6941de76fafa89240d6207d5
---
.../apache/hadoop/hbase/io/hfile/CacheConfig.java | 61 ++++++++++++----------
.../hadoop/hbase/io/hfile/TestCacheConfig.java | 21 ++++++--
2 files changed, 49 insertions(+), 33 deletions(-)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java
index b6357ca94b8..ae196340db6 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java
@@ -125,7 +125,7 @@ public class CacheConfig implements
PropagatingConfigurationObserver {
private volatile boolean cacheDataOnRead;
/** Whether blocks should be flagged as in-memory when being cached */
- private final boolean inMemory;
+ private boolean inMemory;
/** Whether data blocks should be cached when new files are written */
private volatile boolean cacheDataOnWrite;
@@ -140,28 +140,29 @@ public class CacheConfig implements
PropagatingConfigurationObserver {
private volatile boolean evictOnClose;
/** Whether data blocks should be stored in compressed and/or encrypted form
in the cache */
- private final boolean cacheDataCompressed;
+ private boolean cacheDataCompressed;
/** Whether data blocks should be prefetched into the cache */
- private final boolean prefetchOnOpen;
+ private boolean prefetchOnOpen;
/**
* Whether data blocks should be cached when compacted file is written
*/
- private final boolean cacheCompactedDataOnWrite;
+ private boolean cacheCompactedDataOnWrite;
/**
* Determine threshold beyond which we do not cache blocks on compaction
*/
private long cacheCompactedDataOnWriteThreshold;
- private final boolean dropBehindCompaction;
+ private boolean dropBehindCompaction;
// Local reference to the block cache
private final BlockCache blockCache;
private final ByteBuffAllocator byteBuffAllocator;
+
/**
* Create a cache configuration using the specified configuration object and
defaults for family
* level settings. Only use if no column family context.
@@ -182,30 +183,32 @@ public class CacheConfig implements
PropagatingConfigurationObserver {
*/
public CacheConfig(Configuration conf, ColumnFamilyDescriptor family,
BlockCache blockCache,
ByteBuffAllocator byteBuffAllocator) {
- this.cacheDataOnRead = conf.getBoolean(CACHE_DATA_ON_READ_KEY,
DEFAULT_CACHE_DATA_ON_READ)
- && (family == null ? true : family.isBlockCacheEnabled());
- this.inMemory = family == null ? DEFAULT_IN_MEMORY : family.isInMemory();
- this.cacheDataCompressed =
- conf.getBoolean(CACHE_DATA_BLOCKS_COMPRESSED_KEY,
DEFAULT_CACHE_DATA_COMPRESSED);
- this.dropBehindCompaction =
- conf.getBoolean(DROP_BEHIND_CACHE_COMPACTION_KEY,
DROP_BEHIND_CACHE_COMPACTION_DEFAULT);
- // For the following flags we enable them regardless of per-schema settings
- // if they are enabled in the global configuration.
- this.cacheDataOnWrite = conf.getBoolean(CACHE_BLOCKS_ON_WRITE_KEY,
DEFAULT_CACHE_DATA_ON_WRITE)
- || (family == null ? false : family.isCacheDataOnWrite());
- this.cacheIndexesOnWrite =
- conf.getBoolean(CACHE_INDEX_BLOCKS_ON_WRITE_KEY,
DEFAULT_CACHE_INDEXES_ON_WRITE)
- || (family == null ? false : family.isCacheIndexesOnWrite());
- this.cacheBloomsOnWrite =
- conf.getBoolean(CACHE_BLOOM_BLOCKS_ON_WRITE_KEY,
DEFAULT_CACHE_BLOOMS_ON_WRITE)
- || (family == null ? false : family.isCacheBloomsOnWrite());
- this.evictOnClose = conf.getBoolean(EVICT_BLOCKS_ON_CLOSE_KEY,
DEFAULT_EVICT_ON_CLOSE)
- || (family == null ? false : family.isEvictBlocksOnClose());
- this.prefetchOnOpen = conf.getBoolean(PREFETCH_BLOCKS_ON_OPEN_KEY,
DEFAULT_PREFETCH_ON_OPEN)
- || (family == null ? false : family.isPrefetchBlocksOnOpen());
- this.cacheCompactedDataOnWrite =
- conf.getBoolean(CACHE_COMPACTED_BLOCKS_ON_WRITE_KEY,
DEFAULT_CACHE_COMPACTED_BLOCKS_ON_WRITE);
- this.cacheCompactedDataOnWriteThreshold =
getCacheCompactedBlocksOnWriteThreshold(conf);
+ if (family == null || family.isBlockCacheEnabled()) {
+ this.cacheDataOnRead = conf.getBoolean(CACHE_DATA_ON_READ_KEY,
DEFAULT_CACHE_DATA_ON_READ);
+ this.inMemory = family == null ? DEFAULT_IN_MEMORY : family.isInMemory();
+ this.cacheDataCompressed =
+ conf.getBoolean(CACHE_DATA_BLOCKS_COMPRESSED_KEY,
DEFAULT_CACHE_DATA_COMPRESSED);
+ this.dropBehindCompaction =
+ conf.getBoolean(DROP_BEHIND_CACHE_COMPACTION_KEY,
DROP_BEHIND_CACHE_COMPACTION_DEFAULT);
+ // For the following flags we enable them regardless of per-schema
settings
+ // if they are enabled in the global configuration.
+ this.cacheDataOnWrite =
+ conf.getBoolean(CACHE_BLOCKS_ON_WRITE_KEY, DEFAULT_CACHE_DATA_ON_WRITE)
+ || (family == null ? false : family.isCacheDataOnWrite());
+ this.cacheIndexesOnWrite =
+ conf.getBoolean(CACHE_INDEX_BLOCKS_ON_WRITE_KEY,
DEFAULT_CACHE_INDEXES_ON_WRITE)
+ || (family == null ? false : family.isCacheIndexesOnWrite());
+ this.cacheBloomsOnWrite =
+ conf.getBoolean(CACHE_BLOOM_BLOCKS_ON_WRITE_KEY,
DEFAULT_CACHE_BLOOMS_ON_WRITE)
+ || (family == null ? false : family.isCacheBloomsOnWrite());
+ this.evictOnClose = conf.getBoolean(EVICT_BLOCKS_ON_CLOSE_KEY,
DEFAULT_EVICT_ON_CLOSE)
+ || (family == null ? false : family.isEvictBlocksOnClose());
+ this.prefetchOnOpen = conf.getBoolean(PREFETCH_BLOCKS_ON_OPEN_KEY,
DEFAULT_PREFETCH_ON_OPEN)
+ || (family == null ? false : family.isPrefetchBlocksOnOpen());
+ this.cacheCompactedDataOnWrite =
conf.getBoolean(CACHE_COMPACTED_BLOCKS_ON_WRITE_KEY,
+ DEFAULT_CACHE_COMPACTED_BLOCKS_ON_WRITE);
+ this.cacheCompactedDataOnWriteThreshold =
getCacheCompactedBlocksOnWriteThreshold(conf);
+ }
this.blockCache = blockCache;
this.byteBuffAllocator = byteBuffAllocator;
}
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java
index bee8ca0667d..c26c8008a31 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java
@@ -188,12 +188,14 @@ public class TestCacheConfig {
@Test
public void testDisableCacheDataBlock() throws IOException {
+ // First tests the default configs behaviour and block cache enabled
Configuration conf = HBaseConfiguration.create();
CacheConfig cacheConfig = new CacheConfig(conf);
assertTrue(cacheConfig.shouldCacheBlockOnRead(BlockCategory.DATA));
assertFalse(cacheConfig.shouldCacheCompressed(BlockCategory.DATA));
assertFalse(cacheConfig.shouldCacheDataCompressed());
assertFalse(cacheConfig.shouldCacheDataOnWrite());
+ assertFalse(cacheConfig.shouldCacheCompactedBlocksOnWrite());
assertTrue(cacheConfig.shouldCacheDataOnRead());
assertTrue(cacheConfig.shouldCacheBlockOnRead(BlockCategory.INDEX));
assertTrue(cacheConfig.shouldCacheBlockOnRead(BlockCategory.META));
@@ -201,10 +203,12 @@ public class TestCacheConfig {
assertFalse(cacheConfig.shouldCacheBloomsOnWrite());
assertFalse(cacheConfig.shouldCacheIndexesOnWrite());
+ // Tests block cache enabled and related cache on write flags enabled
conf.setBoolean(CacheConfig.CACHE_BLOCKS_ON_WRITE_KEY, true);
conf.setBoolean(CacheConfig.CACHE_DATA_BLOCKS_COMPRESSED_KEY, true);
conf.setBoolean(CacheConfig.CACHE_BLOOM_BLOCKS_ON_WRITE_KEY, true);
conf.setBoolean(CacheConfig.CACHE_INDEX_BLOCKS_ON_WRITE_KEY, true);
+ conf.setBoolean(CacheConfig.CACHE_COMPACTED_BLOCKS_ON_WRITE_KEY, true);
cacheConfig = new CacheConfig(conf);
assertTrue(cacheConfig.shouldCacheBlockOnRead(BlockCategory.DATA));
@@ -217,9 +221,12 @@ public class TestCacheConfig {
assertTrue(cacheConfig.shouldCacheBlockOnRead(BlockCategory.BLOOM));
assertTrue(cacheConfig.shouldCacheBloomsOnWrite());
assertTrue(cacheConfig.shouldCacheIndexesOnWrite());
+ assertTrue(cacheConfig.shouldCacheCompactedBlocksOnWrite());
+ // Tests block cache enabled but related cache on read/write properties
disabled
conf.setBoolean(CacheConfig.CACHE_DATA_ON_READ_KEY, false);
conf.setBoolean(CacheConfig.CACHE_BLOCKS_ON_WRITE_KEY, false);
+ conf.setBoolean(CacheConfig.CACHE_COMPACTED_BLOCKS_ON_WRITE_KEY, false);
cacheConfig = new CacheConfig(conf);
assertFalse(cacheConfig.shouldCacheBlockOnRead(BlockCategory.DATA));
@@ -227,14 +234,20 @@ public class TestCacheConfig {
assertFalse(cacheConfig.shouldCacheDataCompressed());
assertFalse(cacheConfig.shouldCacheDataOnWrite());
assertFalse(cacheConfig.shouldCacheDataOnRead());
+ assertFalse(cacheConfig.shouldCacheCompactedBlocksOnWrite());
assertTrue(cacheConfig.shouldCacheBlockOnRead(BlockCategory.INDEX));
assertFalse(cacheConfig.shouldCacheBlockOnRead(BlockCategory.META));
assertTrue(cacheConfig.shouldCacheBlockOnRead(BlockCategory.BLOOM));
assertTrue(cacheConfig.shouldCacheBloomsOnWrite());
assertTrue(cacheConfig.shouldCacheIndexesOnWrite());
- conf.setBoolean(CacheConfig.CACHE_DATA_ON_READ_KEY, true);
- conf.setBoolean(CacheConfig.CACHE_BLOCKS_ON_WRITE_KEY, false);
+ // Finally tests block cache disabled in the column family but all cache
on read/write
+ // properties enabled in the config.
+ conf.setBoolean(CacheConfig.CACHE_BLOCKS_ON_WRITE_KEY, true);
+ conf.setBoolean(CacheConfig.CACHE_DATA_BLOCKS_COMPRESSED_KEY, true);
+ conf.setBoolean(CacheConfig.CACHE_BLOOM_BLOCKS_ON_WRITE_KEY, true);
+ conf.setBoolean(CacheConfig.CACHE_INDEX_BLOCKS_ON_WRITE_KEY, true);
+ conf.setBoolean(CacheConfig.CACHE_COMPACTED_BLOCKS_ON_WRITE_KEY, true);
HColumnDescriptor family = new
HColumnDescriptor("testDisableCacheDataBlock");
family.setBlockCacheEnabled(false);
@@ -248,8 +261,8 @@ public class TestCacheConfig {
assertTrue(cacheConfig.shouldCacheBlockOnRead(BlockCategory.INDEX));
assertFalse(cacheConfig.shouldCacheBlockOnRead(BlockCategory.META));
assertTrue(cacheConfig.shouldCacheBlockOnRead(BlockCategory.BLOOM));
- assertTrue(cacheConfig.shouldCacheBloomsOnWrite());
- assertTrue(cacheConfig.shouldCacheIndexesOnWrite());
+ assertFalse(cacheConfig.shouldCacheBloomsOnWrite());
+ assertFalse(cacheConfig.shouldCacheIndexesOnWrite());
}
@Test
