Author: stack
Date: Sat Dec 4 06:27:37 2010
New Revision: 1042102
URL: http://svn.apache.org/viewvc?rev=1042102&view=rev
Log:
HBASE-3298 Regionserver can close during a split causing double assignment --
fix broken heapsize test
Modified:
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Modified:
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1042102&r1=1042101&r2=1042102&view=diff
==============================================================================
---
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
(original)
+++
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Sat Dec 4 06:27:37 2010
@@ -3147,7 +3147,7 @@ public class HRegion implements HeapSize
(20 * 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
