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 2016/06/18 02:03:46 UTC
[2/2] hbase git commit: HBASE-16058 TestHRegion fails on 1.4 builds
HBASE-16058 TestHRegion fails on 1.4 builds
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1a989a19
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1a989a19
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1a989a19
Branch: refs/heads/branch-1
Commit: 1a989a1964e8bc5af3bb1c48f41da9dd06bd1257
Parents: e721aa1
Author: Enis Soztutar <en...@apache.org>
Authored: Fri Jun 17 18:41:51 2016 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Fri Jun 17 19:00:01 2016 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/regionserver/TestHRegion.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1a989a19/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index 4d9c6bd..33226e0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -149,6 +149,7 @@ import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.hbase.test.MetricsAssertHelper;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.ClassSize;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper;
import org.apache.hadoop.hbase.util.FSUtils;
@@ -431,8 +432,9 @@ public class TestHRegion {
fail("Should have failed with IOException");
} catch (IOException expected) {
}
- assertEquals("memstoreSize should be incremented", onePutSize * 2, region.getMemstoreSize());
- assertEquals("flushable size should be incremented", onePutSize * 2, store.getFlushableSize());
+ long expectedSize = onePutSize * 2 - ClassSize.ARRAY;
+ assertEquals("memstoreSize should be incremented", expectedSize, region.getMemstoreSize());
+ assertEquals("flushable size should be incremented", expectedSize, store.getFlushableSize());
region.setCoprocessorHost(null);
HBaseTestingUtility.closeRegionAndWAL(region);
@@ -508,13 +510,14 @@ public class TestHRegion {
p2.add(new KeyValue(row, COLUMN_FAMILY_BYTES, qual2, 2, (byte[])null));
p2.add(new KeyValue(row, COLUMN_FAMILY_BYTES, qual3, 3, (byte[])null));
region.put(p2);
- Assert.assertEquals(sizeOfOnePut * 3, region.getMemstoreSize());
+ long expectedSize = sizeOfOnePut * 3- ClassSize.ARRAY;
+ Assert.assertEquals(expectedSize, region.getMemstoreSize());
// Do a successful flush. It will clear the snapshot only. Thats how flushes work.
// If already a snapshot, we clear it else we move the memstore to be snapshot and flush
// it
region.flush(true);
// Make sure our memory accounting is right.
- Assert.assertEquals(sizeOfOnePut * 2, region.getMemstoreSize());
+ Assert.assertEquals(sizeOfOnePut * 2 - ClassSize.ARRAY, region.getMemstoreSize());
} catch (Exception e) {
int x = 0;
} finally {