You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2013/05/18 02:06:32 UTC
svn commit: r1484033 - in /hbase/branches/0.95/hbase-server/src:
main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java
Author: enis
Date: Sat May 18 00:06:32 2013
New Revision: 1484033
URL: http://svn.apache.org/r1484033
Log:
HBASE-8547. Fix java.lang.RuntimeException: Cached an already cached block (Addendum3 to remove assertion)
Modified:
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java
Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java?rev=1484033&r1=1484032&r2=1484033&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java Sat May 18 00:06:32 2013
@@ -302,7 +302,6 @@ public class LruBlockCache implements Bl
String msg = "Cached an already cached block: " + cacheKey + " cb:" + cb.getCacheKey();
msg += ". This is harmless and can happen in rare cases (see HBASE-8547)";
LOG.warn(msg);
- assert false : msg;
return;
}
cb = new CachedBlock(cacheKey, buf, count.incrementAndGet(), inMemory);
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java?rev=1484033&r1=1484032&r2=1484033&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java Sat May 18 00:06:32 2013
@@ -118,17 +118,6 @@ public class TestLruBlockCache {
assertEquals(buf.heapSize(), block.heapSize());
}
- // Re-add same blocks and ensure nothing has changed
- for (CachedItem block : blocks) {
- try {
- cache.cacheBlock(block.cacheKey, block);
- assertTrue("Cache should not allow re-caching a block", false);
- } catch(AssertionError re) {
- // expected
- assertTrue(re.getMessage().contains("Cached an already cached block"));
- }
- }
-
// Verify correctly calculated cache heap size
assertEquals(expectedCacheSize, cache.heapSize());