Author: stack
Date: Sat Dec 4 06:28:12 2010
New Revision: 1042103
URL: http://svn.apache.org/viewvc?rev=1042103&view=rev
Log:
HBASE-3298 Regionserver can close during a split causing double assignment --
fix broken heapsize test
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1042103&r1=1042102&r2=1042103&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Sat Dec 4 06:28:12 2010
@@ -3284,7 +3284,7 @@ public class HRegion implements HeapSize
(22 * ClassSize.REFERENCE) + ClassSize.OBJECT + Bytes.SIZEOF_INT);
public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD +
- ClassSize.OBJECT + (2 * ClassSize.ATOMIC_BOOLEAN) +
+ (ClassSize.OBJECT * 2) + (2 * ClassSize.ATOMIC_BOOLEAN) +
ClassSize.ATOMIC_LONG + ClassSize.ATOMIC_INTEGER +
// Using TreeMap for TreeSet
