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

HBASE-4942 HMaster is unable to start of HFile V1 is used (Honghua Zhu) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1210303 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2011-12-05 01:11:10 +00:00
parent 1a2ea74705
commit 5021d29ef4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -451,6 +451,7 @@ Release 0.92.0 - Unreleased
ubuntu machine ubuntu machine
HBASE-4878 Master crash when splitting hlog may cause data loss (Chunhui Shen) HBASE-4878 Master crash when splitting hlog may cause data loss (Chunhui Shen)
HBASE-4945 NPE in HRegion.bulkLoadHFiles (Andrew P and Lars H) HBASE-4945 NPE in HRegion.bulkLoadHFiles (Andrew P and Lars H)
HBASE-4942 HMaster is unable to start of HFile V1 is used (Honghua Zhu)
TESTS TESTS
HBASE-4450 test for number of blocks read: to serve as baseline for expected HBASE-4450 test for number of blocks read: to serve as baseline for expected

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

@ -364,7 +364,7 @@ public class HFileReaderV1 extends AbstractHFileReader {
@Override @Override
public void close(boolean evictOnClose) throws IOException { public void close(boolean evictOnClose) throws IOException {
if (evictOnClose) { if (evictOnClose && cacheConf.isBlockCacheEnabled()) {
int numEvicted = 0; int numEvicted = 0;
for (int i = 0; i < dataBlockIndexReader.getRootBlockCount(); i++) { for (int i = 0; i < dataBlockIndexReader.getRootBlockCount(); i++) {
if (cacheConf.getBlockCache().evictBlock(HFile.getBlockCacheKey(name, if (cacheConf.getBlockCache().evictBlock(HFile.getBlockCacheKey(name,