diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/MobSnapshotTestingUtils.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/MobSnapshotTestingUtils.java index 9026115..c7847e1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/MobSnapshotTestingUtils.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/MobSnapshotTestingUtils.java @@ -38,6 +38,20 @@ public class MobSnapshotTestingUtils { public static void createMobTable(final HBaseTestingUtility util, final TableName tableName, int regionReplication, final byte[]... families) throws IOException, InterruptedException { + createMobTable(util, tableName, SnapshotTestingUtils.getSplitKeys(), + regionReplication, families); + } + + public static void createMobTable(final HBaseTestingUtility util, + final TableName tableName, int regionReplication, int nRegions, + final byte[]... families) throws IOException, InterruptedException { + createMobTable(util, tableName, SnapshotTestingUtils.getSplitKeys(nRegions), + regionReplication, families); + } + + private static void createMobTable(final HBaseTestingUtility util, + final TableName tableName, final byte[][] splitKeys, int regionReplication, + final byte[]... families) throws IOException, InterruptedException { HTableDescriptor htd = new HTableDescriptor(tableName); htd.setRegionReplication(regionReplication); for (byte[] family : families) { @@ -46,7 +60,6 @@ public class MobSnapshotTestingUtils { hcd.setMobThreshold(0L); htd.addFamily(hcd); } - byte[][] splitKeys = SnapshotTestingUtils.getSplitKeys(); util.getHBaseAdmin().createTable(htd, splitKeys); SnapshotTestingUtils.waitForTableToBeOnline(util, tableName); assertEquals((splitKeys.length + 1) * regionReplication, util diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java index 770bb00..075ef3c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java @@ -750,23 +750,32 @@ public final class SnapshotTestingUtils { } public static void createTable(final HBaseTestingUtility util, final TableName tableName, - int regionReplication, final byte[]... families) throws IOException, InterruptedException { + int regionReplication, int nRegions, final byte[]... families) + throws IOException, InterruptedException { HTableDescriptor htd = new HTableDescriptor(tableName); htd.setRegionReplication(regionReplication); for (byte[] family : families) { HColumnDescriptor hcd = new HColumnDescriptor(family); htd.addFamily(hcd); } - byte[][] splitKeys = getSplitKeys(); + byte[][] splitKeys = getSplitKeys(nRegions); util.createTable(htd, splitKeys); assertEquals((splitKeys.length + 1) * regionReplication, util.getHBaseAdmin().getTableRegions(tableName).size()); } public static byte[][] getSplitKeys() { - byte[][] splitKeys = new byte[KEYS.length-2][]; + return getSplitKeys(KEYS.length); + } + + public static byte[][] getSplitKeys(int nRegions) { + nRegions = nRegions < KEYS.length ? nRegions : (KEYS.length - 1); + final byte[][] splitKeys = new byte[nRegions-1][]; + final int step = KEYS.length / nRegions; + int keyIndex = 1; for (int i = 0; i < splitKeys.length; ++i) { - splitKeys[i] = new byte[] { KEYS[i+1] }; + splitKeys[i] = new byte[] { KEYS[keyIndex] }; + keyIndex += step; } return splitKeys; } @@ -776,6 +785,16 @@ public final class SnapshotTestingUtils { createTable(util, tableName, 1, families); } + public static void createTable(final HBaseTestingUtility util, final TableName tableName, + final int regionReplication, final byte[]... families) throws IOException, InterruptedException { + createTable(util, tableName, regionReplication, KEYS.length, families); + } + + public static void createPreSplitTable(final HBaseTestingUtility util, final TableName tableName, + final int nRegions, final byte[]... families) throws IOException, InterruptedException { + createTable(util, tableName, 1, nRegions, families); + } + public static void loadData(final HBaseTestingUtility util, final TableName tableName, int rows, byte[]... families) throws IOException, InterruptedException { BufferedMutator mutator = util.getConnection().getBufferedMutator(tableName); @@ -861,6 +880,6 @@ public final class SnapshotTestingUtils { } } } - assert(set.size() == getSplitKeys().length + 1); + assertEquals(getSplitKeys().length + 1, set.size()); } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java index d0b32f8..dabcab6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java @@ -91,12 +91,10 @@ public class TestExportSnapshot { public static void setUpBeforeClass() throws Exception { setUpBaseConf(TEST_UTIL.getConfiguration()); TEST_UTIL.startMiniCluster(3); - TEST_UTIL.startMiniMapReduceCluster(); } @AfterClass public static void tearDownAfterClass() throws Exception { - TEST_UTIL.shutdownMiniMapReduceCluster(); TEST_UTIL.shutdownMiniCluster(); } @@ -127,7 +125,7 @@ public class TestExportSnapshot { } protected void createTable() throws Exception { - SnapshotTestingUtils.createTable(TEST_UTIL, tableName, FAMILY); + SnapshotTestingUtils.createPreSplitTable(TEST_UTIL, tableName, 2, FAMILY); } @After diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestMobExportSnapshot.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestMobExportSnapshot.java index b6cb339..b05e9cf 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestMobExportSnapshot.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestMobExportSnapshot.java @@ -45,12 +45,11 @@ public class TestMobExportSnapshot extends TestExportSnapshot { public static void setUpBeforeClass() throws Exception { setUpBaseConf(TEST_UTIL.getConfiguration()); TEST_UTIL.startMiniCluster(3); - TEST_UTIL.startMiniMapReduceCluster(); } @Override protected void createTable() throws Exception { - MobSnapshotTestingUtils.createMobTable(TEST_UTIL, tableName, 1, FAMILY); + MobSnapshotTestingUtils.createMobTable(TEST_UTIL, tableName, 1, 2, FAMILY); } @Override diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestMobSecureExportSnapshot.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestMobSecureExportSnapshot.java index 4a89db8..403e8bb 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestMobSecureExportSnapshot.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestMobSecureExportSnapshot.java @@ -45,7 +45,6 @@ public class TestMobSecureExportSnapshot extends TestMobExportSnapshot { SecureTestUtil.enableSecurity(TEST_UTIL.getConfiguration()); TEST_UTIL.startMiniCluster(3); - TEST_UTIL.startMiniMapReduceCluster(); // Wait for the ACL table to become available TEST_UTIL.waitTableEnabled(AccessControlLists.ACL_TABLE_NAME); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSecureExportSnapshot.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSecureExportSnapshot.java index cf55c4d..f335e4e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSecureExportSnapshot.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSecureExportSnapshot.java @@ -51,7 +51,6 @@ public class TestSecureExportSnapshot extends TestExportSnapshot { SecureTestUtil.enableSecurity(TEST_UTIL.getConfiguration()); TEST_UTIL.startMiniCluster(3); - TEST_UTIL.startMiniMapReduceCluster(); // Wait for the ACL table to become available TEST_UTIL.waitTableEnabled(AccessControlLists.ACL_TABLE_NAME);