From 062d1dcf2bbb4a89f4232d40527e3624a8f714f8 Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Mon, 20 Aug 2018 13:43:25 -0500 Subject: [PATCH] HBASE-21076 refactor TestTableResource to ask for a multi-region table instead of relying on a split operation. Also correct how the test does string conversion for region names that include non-printable characters. includes addendum. Signed-off-by: Duo Zhang Signed-off-by: Ted Yu Signed-off-by: Andrew Purtell (cherry picked from commit 6b18e39f30b30ad2aa027eefbf520f2c5b1de490) (cherry picked from commit 63f2d3cbdc8151f5f61f33e0a078c51b9ac076a5) Conflicts: hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java --- .../hadoop/hbase/rest/TestTableResource.java | 55 ++++++------------- 1 file changed, 17 insertions(+), 38 deletions(-) diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java index 25508b0fd11..2551ee80325 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java @@ -35,15 +35,11 @@ import javax.xml.bind.JAXBException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.Waiter; -import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Put; @@ -58,7 +54,6 @@ import org.apache.hadoop.hbase.rest.model.TableModel; import org.apache.hadoop.hbase.rest.model.TableRegionModel; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -68,9 +63,10 @@ import org.junit.experimental.categories.Category; public class TestTableResource { private static final Log LOG = LogFactory.getLog(TestTableResource.class); - private static TableName TABLE = TableName.valueOf("TestTableResource"); - private static String COLUMN_FAMILY = "test"; - private static String COLUMN = COLUMN_FAMILY + ":qualifier"; + private static final TableName TABLE = TableName.valueOf("TestTableResource"); + private static final String COLUMN_FAMILY = "test"; + private static final String COLUMN = COLUMN_FAMILY + ":qualifier"; + private static final int NUM_REGIONS = 4; private static List regionMap; private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); @@ -90,13 +86,7 @@ public class TestTableResource { TableInfoModel.class, TableListModel.class, TableRegionModel.class); - Admin admin = TEST_UTIL.getHBaseAdmin(); - if (admin.tableExists(TABLE)) { - return; - } - HTableDescriptor htd = new HTableDescriptor(TABLE); - htd.addFamily(new HColumnDescriptor(COLUMN_FAMILY)); - admin.createTable(htd); + TEST_UTIL.createMultiRegionTable(TABLE, Bytes.toBytes(COLUMN_FAMILY), NUM_REGIONS); byte[] k = new byte[3]; byte [][] famAndQf = KeyValue.parseColumn(Bytes.toBytes(COLUMN)); List puts = new ArrayList<>(); @@ -113,35 +103,20 @@ public class TestTableResource { } } } + Connection connection = TEST_UTIL.getConnection(); Table table = connection.getTable(TABLE); table.put(puts); table.close(); - // get the initial layout (should just be one region) - - final RegionLocator regionLocator = connection.getRegionLocator(TABLE); + + RegionLocator regionLocator = connection.getRegionLocator(TABLE); List m = regionLocator.getAllRegionLocations(); - assertEquals(m.size(), 1); - // tell the master to split the table - admin.split(TABLE); - // give some time for the split to happen - TEST_UTIL.waitFor(15 * 1000, 250, new Waiter.Predicate() { - @Override - public boolean evaluate() throws IOException { - List regionLocations = regionLocator.getAllRegionLocations(); - return regionLocations != null && - regionLocations.size() == 2 && regionLocations.get(0).getServerName() != null && - regionLocations.get(1).getServerName() != null; - } - }); - m = regionLocator.getAllRegionLocations(); - - // should have two regions now - assertEquals(2, m.size()); + // should have four regions now + assertEquals(NUM_REGIONS, m.size()); regionMap = m; - LOG.info("regions: " + regionMap); + LOG.error("regions: " + regionMap); regionLocator.close(); } @@ -172,10 +147,14 @@ public class TestTableResource { while (regions.hasNext()) { TableRegionModel region = regions.next(); boolean found = false; + LOG.debug("looking for region " + region.getName()); for (HRegionLocation e: regionMap) { HRegionInfo hri = e.getRegionInfo(); - String hriRegionName = hri.getRegionNameAsString(); + // getRegionNameAsString uses Bytes.toStringBinary which escapes some non-printable + // characters + String hriRegionName = Bytes.toString(hri.getRegionName()); String regionName = region.getName(); + LOG.debug("comparing to region " + hriRegionName); if (hriRegionName.equals(regionName)) { found = true; byte[] startKey = hri.getStartKey(); @@ -192,7 +171,7 @@ public class TestTableResource { break; } } - assertTrue(found); + assertTrue("Couldn't find region " + region.getName(), found); } }