Skip to content

HBASE-30488 BucketCache persistence loses the archived flag of BlockC… #8807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liuxiaocs7 merged 1 commit into from
Oct 26, 2026
Merged

HBASE-30488 BucketCache persistence loses the archived flag of BlockC… #8807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketProtoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,10 @@ private static void addEntryToBuilder(Map.Entry<BlockCacheKey, BucketEntry> entr
}

private static BucketCacheProtos.BlockCacheKey toPB(BlockCacheKey key) {
BucketCacheProtos.BlockCacheKey.Builder builder = BucketCacheProtos.BlockCacheKey.newBuilder()
.setHfilename(key.getHfileName()).setOffset(key.getOffset())
.setPrimaryReplicaBlock(key.isPrimary()).setBlockType(toPB(key.getBlockType()));
BucketCacheProtos.BlockCacheKey.Builder builder =
BucketCacheProtos.BlockCacheKey.newBuilder().setHfilename(key.getHfileName())
.setOffset(key.getOffset()).setPrimaryReplicaBlock(key.isPrimary())
.setBlockType(toPB(key.getBlockType())).setArchived(key.isArchived());
if (key.getCfName() != null) {
builder.setFamilyName(key.getCfName());
}
Expand Down
53 changes: 53 additions & 0 deletions .../test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestRecoveryPersistentBucketCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
*/
package org.apache.hadoop.hbase.io.hfile.bucket;

import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonMap;
import static org.apache.hadoop.hbase.io.hfile.CacheConfig.BUCKETCACHE_PERSIST_INTERVAL_KEY;
import static org.apache.hadoop.hbase.io.hfile.bucket.BucketCache.ACCEPT_FACTOR_CONFIG_NAME;
import static org.apache.hadoop.hbase.io.hfile.bucket.BucketCache.DEFAULT_ERROR_TOLERATION_DURATION;
Expand All @@ -28,19 +30,23 @@
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.time.Duration;
import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.Waiter;
import org.apache.hadoop.hbase.io.hfile.BlockCacheKey;
import org.apache.hadoop.hbase.io.hfile.BlockPriority;
import org.apache.hadoop.hbase.io.hfile.BlockType;
import org.apache.hadoop.hbase.io.hfile.CacheTestUtils;
import org.apache.hadoop.hbase.io.hfile.Cacheable;
import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

/**
* Basic test for check file's integrity before start BucketCache in fileIOEngine
Expand Down Expand Up @@ -208,6 +214,53 @@ public void testBlockPriorityAfterRecovery() throws Exception {
TEST_UTIL.cleanupTestDir();
}

@ParameterizedTest
@ValueSource(booleans = { false, true })
public void testArchivedFlagAfterRecovery(boolean archived) throws Exception {
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
Path testDir = TEST_UTIL.getDataTestDir();
TEST_UTIL.getTestFileSystem().mkdirs(testDir);
Configuration conf = HBaseConfiguration.create();
conf.setLong(BUCKETCACHE_PERSIST_INTERVAL_KEY, Long.MAX_VALUE);
int[] bucketSizes = new int[] { 8 * 1024 + 1024 };
CacheTestUtils.HFileBlockPair block = CacheTestUtils.generateHFileBlocks(8192, 1)[0];
BlockCacheKey key =
new BlockCacheKey("test-file", "cf", "test-region", 0, true, BlockType.DATA, archived);
BucketCache bucketCache = null;
BucketCache recoveredCache = null;
try {
bucketCache = new BucketCache("file:" + testDir + "/bucket.cache", capacitySize, 8192,
bucketSizes, writeThreads, writerQLen, testDir + "/bucket.persistence",
DEFAULT_ERROR_TOLERATION_DURATION, conf);
assertTrue(bucketCache.waitForCacheInitialization(10000));
cacheAndWaitUntilFlushedToBucket(bucketCache, key, block.getBlock());
long cachedSize = bucketCache.backingMap.get(key).getLength();
Map<String, Long> expectedRegionCachedSize =
archived ? emptyMap() : singletonMap(key.getRegionName(), cachedSize);
assertEquals(expectedRegionCachedSize, bucketCache.getRegionCachedInfo().get());

bucketCache.shutdown();
bucketCache = null;
recoveredCache = new BucketCache("file:" + testDir + "/bucket.cache", capacitySize, 8192,
bucketSizes, writeThreads, writerQLen, testDir + "/bucket.persistence",
DEFAULT_ERROR_TOLERATION_DURATION, conf);
assertTrue(recoveredCache.waitForCacheInitialization(10000));
assertEquals(1, recoveredCache.backingMap.size());
// Inspect the recovered key: BlockCacheKey.equals does not compare the archived flag.
assertEquals(archived, recoveredCache.backingMap.keySet().iterator().next().isArchived());
assertEquals(expectedRegionCachedSize, recoveredCache.getRegionCachedInfo().get());
} finally {
if (recoveredCache != null) {
recoveredCache.shutdown();
}
if (bucketCache != null) {
bucketCache.shutdown();
}
block.getBlock().release();
TEST_UTIL.cleanupTestDir();
}
}

@Test
public void testValidateCacheInitialization() throws Exception {
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
Expand Down
Loading