hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From la...@apache.org
Subject svn commit: r1189504 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java
Date Wed, 26 Oct 2011 22:13:11 GMT
Author: larsh
Date: Wed Oct 26 22:13:11 2011
New Revision: 1189504

URL: http://svn.apache.org/viewvc?rev=1189504&view=rev
Log:
HBASE-4673  NPE in HFileReaderV2.close during major compaction when hfile.block.cache.size
is set to 0

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

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1189504&r1=1189503&r2=1189504&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Wed Oct 26 22:13:11 2011
@@ -376,6 +376,8 @@ Release 0.92.0 - Unreleased
    HBASE-4645  Edits Log recovery losing data across column families
    HBASE-4634  'test.build.data' property overused leading to write data at the
                wrong place (nkeywal)
+   HBASE-4673  NPE in HFileReaderV2.close during major compaction when
+               hfile.block.cache.size is set to 0 (Lars H)
 
   TESTS
    HBASE-4492  TestRollingRestart fails intermittently

Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java?rev=1189504&r1=1189503&r2=1189504&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java
(original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java
Wed Oct 26 22:13:11 2011
@@ -298,7 +298,7 @@ public class HFileReaderV2 extends Abstr
   }
 
   public void close(boolean evictOnClose) throws IOException {
-    if (evictOnClose) {
+    if (evictOnClose && cacheConf.isBlockCacheEnabled()) {
       int numEvicted = cacheConf.getBlockCache().evictBlocksByPrefix(name
           + HFile.CACHE_KEY_SEPARATOR);
       LOG.debug("On close of file " + name + " evicted " + numEvicted



Mime
View raw message