You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2011/12/05 02:07:29 UTC

svn commit: r1210301 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV1.java

Author: tedyu
Date: Mon Dec  5 01:07:29 2011
New Revision: 1210301

URL: http://svn.apache.org/viewvc?rev=1210301&view=rev
Log:
HBASE-4942  HMaster is unable to start of HFile V1 is used (honghua Zhu)

Modified:
    hbase/branches/0.92/CHANGES.txt
    hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV1.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1210301&r1=1210300&r2=1210301&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Mon Dec  5 01:07:29 2011
@@ -458,6 +458,7 @@ Release 0.92.0 - Unreleased
                server and moving region in testing environment
                (Chunhui Shen)
    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
    HBASE-4492  TestRollingRestart fails intermittently

Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV1.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV1.java?rev=1210301&r1=1210300&r2=1210301&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV1.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV1.java Mon Dec  5 01:07:29 2011
@@ -352,7 +352,7 @@ public class HFileReaderV1 extends Abstr
 
   @Override
   public void close(boolean evictOnClose) throws IOException {
-    if (evictOnClose) {
+    if (evictOnClose && cacheConf.isBlockCacheEnabled()) {
       int numEvicted = 0;
       for (int i = 0; i < dataBlockIndexReader.getRootBlockCount(); i++) {
         if (cacheConf.getBlockCache().evictBlock(HFile.getBlockCacheKey(name,