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

HBASE-4673 NPE in HFileReaderV2.close during major compaction when hfile.block.cache.size is set to 0 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1189481 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
larsh 2011-10-26 21:32:43 +00:00
parent 055d8e3b8c
commit 9f2204fbe3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -27,6 +27,8 @@ Release 0.93.0 - Unreleased
BUG FIXES BUG FIXES
HBASE-4488 Store could miss rows during flush (Lars H via jgray) HBASE-4488 Store could miss rows during flush (Lars H via jgray)
HBASE-4673 NPE in HFileReaderV2.close during major compaction when
hfile.block.cache.size is set to 0 (Lars H)
TESTS TESTS
HBASE-4534 A new unit test for lazy seek and StoreScanner in general HBASE-4534 A new unit test for lazy seek and StoreScanner in general

2
src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java
View File

@ -323,7 +323,7 @@ public class HFileReaderV2 extends AbstractHFileReader {
} }
public void close(boolean evictOnClose) throws IOException { public void close(boolean evictOnClose) throws IOException {
if (evictOnClose) { if (evictOnClose && cacheConf.isBlockCacheEnabled()) {
int numEvicted = cacheConf.getBlockCache().evictBlocksByPrefix(name int numEvicted = cacheConf.getBlockCache().evictBlocksByPrefix(name
+ HFile.CACHE_KEY_SEPARATOR); + HFile.CACHE_KEY_SEPARATOR);
LOG.debug("On close of file " + name + " evicted " + numEvicted LOG.debug("On close of file " + name + " evicted " + numEvicted