You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by wc...@apache.org on 2023/11/29 12:26:04 UTC
(hbase) branch branch-2.5 updated: HBASE-28211 BucketCache.blocksByHFile may leak on allocationFailure or if we reach io errors tolerated (#5530)
This is an automated email from the ASF dual-hosted git repository.
wchevreuil 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 6dd68896942 HBASE-28211 BucketCache.blocksByHFile may leak on allocationFailure or if we reach io errors tolerated (#5530)
6dd68896942 is described below
commit 6dd68896942f509cc0cdb4f10807ed5c26afef12
Author: Wellington Ramos Chevreuil <wc...@apache.org>
AuthorDate: Wed Nov 29 10:40:33 2023 +0000
HBASE-28211 BucketCache.blocksByHFile may leak on allocationFailure or if we reach io errors tolerated (#5530)
Signed-off-by: Duo Zhang <zh...@apache.org>
Change-Id: I13e726441f6040d8f607335a54118fda2c287191
---
.../java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java | 8 +++-----
.../hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java | 2 ++
2 files changed, 5 insertions(+), 5 deletions(-)
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 6659bd10c6f..3da99ddcf78 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
@@ -191,7 +191,7 @@ public class BucketCache implements BlockCache, HeapSize {
*/
transient final IdReadWriteLock<Long> offsetLock = new IdReadWriteLock<>(ReferenceType.SOFT);
- private final NavigableSet<BlockCacheKey> blocksByHFile = new ConcurrentSkipListSet<>((a, b) -> {
+ final NavigableSet<BlockCacheKey> blocksByHFile = new ConcurrentSkipListSet<>((a, b) -> {
int nameComparison = a.getHfileName().compareTo(b.getHfileName());
if (nameComparison != 0) {
return nameComparison;
@@ -1000,6 +1000,7 @@ public class BucketCache implements BlockCache, HeapSize {
*/
protected void putIntoBackingMap(BlockCacheKey key, BucketEntry bucketEntry) {
BucketEntry previousEntry = backingMap.put(key, bucketEntry);
+ blocksByHFile.add(key);
if (previousEntry != null && previousEntry != bucketEntry) {
previousEntry.withWriteLock(offsetLock, () -> {
blockEvicted(key, previousEntry, false, false);
@@ -1080,10 +1081,6 @@ public class BucketCache implements BlockCache, HeapSize {
index++;
continue;
}
- BlockCacheKey cacheKey = re.getKey();
- if (ramCache.containsKey(cacheKey)) {
- blocksByHFile.add(cacheKey);
- }
// Reset the position for reuse.
// It should be guaranteed that the data in the metaBuff has been transferred to the
// ioEngine safely. Otherwise, this reuse is problematic. Fortunately, the data is already
@@ -1339,6 +1336,7 @@ public class BucketCache implements BlockCache, HeapSize {
if (!ioEngine.isPersistent() || persistencePath == null) {
// If persistent ioengine and a path, we will serialize out the backingMap.
this.backingMap.clear();
+ this.blocksByHFile.clear();
}
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java
index 4b729f33411..f20dedda8e7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java
@@ -122,6 +122,7 @@ public class TestBucketWriterThread {
Mockito.when(tooBigCacheable.getSerializedLength()).thenReturn(Integer.MAX_VALUE);
this.bc.cacheBlock(this.plainKey, tooBigCacheable);
doDrainOfOneEntry(this.bc, this.wt, this.q);
+ assertTrue(bc.blocksByHFile.isEmpty());
}
/**
@@ -138,6 +139,7 @@ public class TestBucketWriterThread {
Mockito.any(), Mockito.any(), Mockito.any(), Mockito.any());
this.q.add(spiedRqe);
doDrainOfOneEntry(bc, wt, q);
+ assertTrue(bc.blocksByHFile.isEmpty());
// Cache disabled when ioes w/o ever healing.
assertTrue(!bc.isCacheEnabled());
}