Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-4027 Off Heap Cache never creates Slabs 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1164674 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-09-02 19:17:04 +00:00
parent 58e75dd65c
commit 7994ce3ea9
3 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -234,6 +234,7 @@ Release 0.91.0 - Unreleased
HBASE-4273 java.lang.NullPointerException when a table is being disabled and
HMaster restarts (Ming Ma)
HBASE-4310 SlabCache metrics bugfix (Li Pi)
HBASE-4027 Off Heap Cache never creates Slabs (Li Pi)
IMPROVEMENTS
HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack)

23
src/main/java/org/apache/hadoop/hbase/io/hfile/DoubleBlockCache.java
View File

@ -45,7 +45,6 @@ public class DoubleBlockCache implements BlockCache, HeapSize {
private final SlabCache offHeapCache;
private final CacheStats stats;
/**
* Default constructor. Specify maximum size and expected average block size
* (approximation is fine).
@ -53,26 +52,28 @@ public class DoubleBlockCache implements BlockCache, HeapSize {
* All other factors will be calculated based on defaults specified in this
* class.
*
* @param maxSize
* maximum size of cache, in bytes
* @param blockSize
* approximate size of each block, in bytes
* @param onHeapSize maximum size of the onHeapCache, in bytes.
* @param offHeapSize maximum size of the offHeapCache, in bytes.
* @param onHeapBlockSize average block size of the on heap cache.
* @param offHeapBlockSize average block size for the off heap cache
* @param conf configuration file. currently used only by the off heap cache.
*/
public DoubleBlockCache(long onHeapSize, long offHeapSize, long blockSizeLru,
long blockSizeSlab) {
public DoubleBlockCache(long onHeapSize, long offHeapSize,
long onHeapBlockSize, long offHeapBlockSize, Configuration conf) {
LOG.info("Creating on-heap cache of size "
+ StringUtils.humanReadableInt(onHeapSize)
+ "bytes with an average block size of "
+ StringUtils.humanReadableInt(blockSizeLru) + " bytes.");
onHeapCache = new LruBlockCache(onHeapSize, blockSizeLru);
+ StringUtils.humanReadableInt(onHeapBlockSize) + " bytes.");
onHeapCache = new LruBlockCache(onHeapSize, onHeapBlockSize);
LOG.info("Creating off-heap cache of size "
+ StringUtils.humanReadableInt(offHeapSize)
+ "bytes with an average block size of "
+ StringUtils.humanReadableInt(blockSizeSlab) + " bytes.");
offHeapCache = new SlabCache(offHeapSize, blockSizeSlab);
+ StringUtils.humanReadableInt(offHeapBlockSize) + " bytes.");
offHeapCache = new SlabCache(offHeapSize, offHeapBlockSize);
offHeapCache.addSlabByConf(conf);
this.stats = new CacheStats();
}

2
src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
View File

@ -384,7 +384,7 @@ public class StoreFile {
if(offHeapCacheSize <= 0) {
hfileBlockCache = new LruBlockCache(cacheSize, DEFAULT_BLOCKSIZE_SMALL);
} else {
hfileBlockCache = new DoubleBlockCache(cacheSize, offHeapCacheSize, DEFAULT_BLOCKSIZE_SMALL, blockSize);
hfileBlockCache = new DoubleBlockCache(cacheSize, offHeapCacheSize, DEFAULT_BLOCKSIZE_SMALL, blockSize, conf);
}
return hfileBlockCache;
}