You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2009/07/03 02:01:23 UTC
svn commit: r790764 - in /hadoop/hbase/trunk: CHANGES.txt
src/test/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java
Author: stack
Date: Fri Jul 3 00:01:23 2009
New Revision: 790764
URL: http://svn.apache.org/viewvc?rev=790764&view=rev
Log:
HBASE-1608 TestCachedBlockQueue failing on some jvms
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=790764&r1=790763&r2=790764&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Jul 3 00:01:23 2009
@@ -241,6 +241,7 @@
HBASE-1594 Fix scan addcolumns after hbase-1385 commit (broken hudson build)
HBASE-1595 hadoop-default.xml and zoo.cfg in hbase jar
HBASE-1602 HRegionServer won't go down since we added in new LruBlockCache
+ HBASE-1608 TestCachedBlockQueue failing on some jvms (Jon Gray via Stack)
IMPROVEMENTS
HBASE-1089 Add count of regions on filesystem to master UI; add percentage
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java?rev=790764&r1=790763&r2=790764&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java Fri Jul 3 00:01:23 2009
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
public class TestCachedBlockQueue extends TestCase {
-
+
public void testQueue() throws Exception {
CachedBlock cb1 = new CachedBlock(1000, "cb1", 1);
@@ -95,7 +95,7 @@
queue.add(cb9);
queue.add(cb10);
- CachedBlock cb0 = new CachedBlock(10, "cb0", 0);
+ CachedBlock cb0 = new CachedBlock(10 + CachedBlock.PER_BLOCK_OVERHEAD, "cb0", 0);
queue.add(cb0);
// This is older so we must include it, but it will not end up kicking
@@ -125,7 +125,9 @@
private class CachedBlock extends org.apache.hadoop.hbase.io.hfile.CachedBlock
{
public CachedBlock(long heapSize, String name, long accessTime) {
- super(name,ByteBuffer.allocate((int)heapSize),accessTime,false);
+ super(name,
+ ByteBuffer.allocate((int)(heapSize - CachedBlock.PER_BLOCK_OVERHEAD)),
+ accessTime,false);
}
}