Skip to content

HBASE-30394 Report data block size and count separately in TinyLfuBlockCache #8666

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

Open
Huginn-kio wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −4
Open

HBASE-30394 Report data block size and count separately in TinyLfuBlockCache #8666

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
29 changes: 25 additions & 4 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/TinyLfuBlockCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.hadoop.hbase.io.hfile;

import static java.util.Objects.requireNonNull;

import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.Policy.Eviction;
Expand All @@ -30,14 +29,15 @@
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.LongAdder;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.io.HeapSize;
import org.apache.hadoop.hbase.io.hfile.bucket.BucketCache;
import org.apache.hadoop.hbase.util.ClassSize;
import org.apache.hadoop.util.StringUtils;
import org.apache.yetus.audience.InterfaceAudience;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import org.apache.hbase.thirdparty.com.google.common.base.MoreObjects;
import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;

Expand Down Expand Up @@ -68,6 +68,10 @@ public final class TinyLfuBlockCache implements FirstLevelBlockCache {

transient final Cache<BlockCacheKey, Cacheable> cache;

private final LongAdder dataBlockSize;

private final LongAdder dataBlockElements;

/**
* Creates a block cache.
* @param maximumSizeInBytes maximum size of this cache, in bytes
Expand Down Expand Up @@ -98,6 +102,8 @@ public TinyLfuBlockCache(long maximumSizeInBytes, long avgBlockSize, long maxBlo
this.maxBlockSize = maxBlockSize;
this.policy = cache.policy().eviction().get();
this.stats = new CacheStats(getClass().getSimpleName());
this.dataBlockSize = new LongAdder();
this.dataBlockElements = new LongAdder();

statsThreadPool = Executors.newSingleThreadScheduledExecutor(new ThreadFactoryBuilder()
.setNameFormat("TinyLfuBlockCacheStatsExecutor").setDaemon(true).build());
Expand Down Expand Up @@ -194,6 +200,7 @@ public void cacheBlock(BlockCacheKey key, Cacheable value) {
} else {
value = asReferencedHeapBlock(value);
cache.put(key, value);
updateDataBlockMetrics(value, false);
}
}

Expand Down Expand Up @@ -228,6 +235,7 @@ public boolean evictBlock(BlockCacheKey cacheKey) {
Cacheable value = cache.asMap().remove(cacheKey);
if (value != null) {
value.release();
updateDataBlockMetrics(value, true);
}
return (value != null);
}
Expand Down Expand Up @@ -305,6 +313,7 @@ public void onRemoval(BlockCacheKey key, Cacheable value, RemovalCause cause) {
}

recordEviction();
updateDataBlockMetrics(value, true);

if (victimCache == null) {
return;
Expand Down Expand Up @@ -410,11 +419,23 @@ public long getMaxSize() {

@Override
public long getCurrentDataSize() {
return getCurrentSize();
return this.dataBlockSize.sum();
}

@Override
public long getDataBlockCount() {
return getBlockCount();
return this.dataBlockElements.sum();
}

/**
* Helper function that updates the data block size and count
*/
private void updateDataBlockMetrics(Cacheable block, boolean evict) {
long size = ClassSize.align(block.heapSize());
BlockType type = block.getBlockType();
if (type != null && type.isData()) {
dataBlockSize.add(evict ? -1 * size : size);
dataBlockElements.add(evict ? -1 : 1);
}
}
}