Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-7717 addendum, really wait for all tables in TestSplitTransactionOnCluster. 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1441150 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
larsh 2013-01-31 19:24:48 +00:00
parent 8ab32498b9
commit 5b665ad594
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
View File

@ -127,8 +127,7 @@ public class TestSplitTransactionOnCluster {
HBaseAdmin admin = new HBaseAdmin(TESTING_UTIL.getConfiguration()); HBaseAdmin admin = new HBaseAdmin(TESTING_UTIL.getConfiguration());
try { try {
// Create table then get the single region for our new table. // Create table then get the single region for our new table.
HTable t = TESTING_UTIL.createTable(tableName, Bytes.toBytes("cf")); HTable t = createTableAndWait(tableName, Bytes.toBytes("cf"));
final List<HRegion> regions = cluster.getRegions(tableName); final List<HRegion> regions = cluster.getRegions(tableName);
HRegionInfo hri = getAndCheckSingleTableRegion(regions); HRegionInfo hri = getAndCheckSingleTableRegion(regions);
int regionServerIndex = cluster.getServerWith(regions.get(0).getRegionName()); int regionServerIndex = cluster.getServerWith(regions.get(0).getRegionName());
@ -217,8 +216,7 @@ public class TestSplitTransactionOnCluster {
Bytes.toBytes("ephemeral"); Bytes.toBytes("ephemeral");
// Create table then get the single region for our new table. // Create table then get the single region for our new table.
HTable t = TESTING_UTIL.createTable(tableName, HConstants.CATALOG_FAMILY); HTable t = createTableAndWait(tableName, HConstants.CATALOG_FAMILY);
List<HRegion> regions = cluster.getRegions(tableName); List<HRegion> regions = cluster.getRegions(tableName);
HRegionInfo hri = getAndCheckSingleTableRegion(regions); HRegionInfo hri = getAndCheckSingleTableRegion(regions);
@ -288,8 +286,7 @@ public class TestSplitTransactionOnCluster {
Bytes.toBytes("testExistingZnodeBlocksSplitAndWeRollback"); Bytes.toBytes("testExistingZnodeBlocksSplitAndWeRollback");
// Create table then get the single region for our new table. // Create table then get the single region for our new table.
HTable t = TESTING_UTIL.createTable(tableName, HConstants.CATALOG_FAMILY); HTable t = createTableAndWait(tableName, HConstants.CATALOG_FAMILY);
List<HRegion> regions = cluster.getRegions(tableName); List<HRegion> regions = cluster.getRegions(tableName);
HRegionInfo hri = getAndCheckSingleTableRegion(regions); HRegionInfo hri = getAndCheckSingleTableRegion(regions);
@ -347,8 +344,7 @@ public class TestSplitTransactionOnCluster {
final byte [] tableName = Bytes.toBytes("testShutdownSimpleFixup"); final byte [] tableName = Bytes.toBytes("testShutdownSimpleFixup");
// Create table then get the single region for our new table. // Create table then get the single region for our new table.
HTable t = TESTING_UTIL.createTable(tableName, HConstants.CATALOG_FAMILY); HTable t = createTableAndWait(tableName, HConstants.CATALOG_FAMILY);
List<HRegion> regions = cluster.getRegions(tableName); List<HRegion> regions = cluster.getRegions(tableName);
HRegionInfo hri = getAndCheckSingleTableRegion(regions); HRegionInfo hri = getAndCheckSingleTableRegion(regions);
@ -400,8 +396,7 @@ public class TestSplitTransactionOnCluster {
Bytes.toBytes("testShutdownFixupWhenDaughterHasSplit"); Bytes.toBytes("testShutdownFixupWhenDaughterHasSplit");
// Create table then get the single region for our new table. // Create table then get the single region for our new table.
HTable t = TESTING_UTIL.createTable(tableName, HConstants.CATALOG_FAMILY); HTable t = createTableAndWait(tableName, HConstants.CATALOG_FAMILY);
List<HRegion> regions = cluster.getRegions(tableName); List<HRegion> regions = cluster.getRegions(tableName);
HRegionInfo hri = getAndCheckSingleTableRegion(regions); HRegionInfo hri = getAndCheckSingleTableRegion(regions);
@ -477,8 +472,7 @@ public class TestSplitTransactionOnCluster {
final byte[] tableName = Bytes.toBytes("testMasterRestartWhenSplittingIsPartial"); final byte[] tableName = Bytes.toBytes("testMasterRestartWhenSplittingIsPartial");
// Create table then get the single region for our new table. // Create table then get the single region for our new table.
HTable t = TESTING_UTIL.createTable(tableName, HConstants.CATALOG_FAMILY); HTable t = createTableAndWait(tableName, HConstants.CATALOG_FAMILY);
List<HRegion> regions = cluster.getRegions(tableName); List<HRegion> regions = cluster.getRegions(tableName);
HRegionInfo hri = getAndCheckSingleTableRegion(regions); HRegionInfo hri = getAndCheckSingleTableRegion(regions);
@ -551,8 +545,7 @@ public class TestSplitTransactionOnCluster {
final byte[] tableName = Bytes.toBytes("testMasterRestartAtRegionSplitPendingCatalogJanitor"); final byte[] tableName = Bytes.toBytes("testMasterRestartAtRegionSplitPendingCatalogJanitor");
// Create table then get the single region for our new table. // Create table then get the single region for our new table.
HTable t = TESTING_UTIL.createTable(tableName, HConstants.CATALOG_FAMILY); HTable t = createTableAndWait(tableName, HConstants.CATALOG_FAMILY);
List<HRegion> regions = cluster.getRegions(tableName); List<HRegion> regions = cluster.getRegions(tableName);
HRegionInfo hri = getAndCheckSingleTableRegion(regions); HRegionInfo hri = getAndCheckSingleTableRegion(regions);
@ -636,8 +629,7 @@ public class TestSplitTransactionOnCluster {
HBaseAdmin admin = new HBaseAdmin(TESTING_UTIL.getConfiguration()); HBaseAdmin admin = new HBaseAdmin(TESTING_UTIL.getConfiguration());
try { try {
// Create table then get the single region for our new table. // Create table then get the single region for our new table.
HTable t = TESTING_UTIL.createTable(tableName, Bytes.toBytes("cf")); HTable t = createTableAndWait(tableName, Bytes.toBytes("cf"));
regions = cluster.getRegions(tableName); regions = cluster.getRegions(tableName);
int regionServerIndex = cluster.getServerWith(regions.get(0).getRegionName()); int regionServerIndex = cluster.getServerWith(regions.get(0).getRegionName());
regionServer = cluster.getRegionServer(regionServerIndex); regionServer = cluster.getRegionServer(regionServerIndex);
@ -689,7 +681,7 @@ public class TestSplitTransactionOnCluster {
throws Exception { throws Exception {
final byte[] tableName = Bytes.toBytes("testRollBackShudBeSuccessfulIfStoreFileIsEmpty"); final byte[] tableName = Bytes.toBytes("testRollBackShudBeSuccessfulIfStoreFileIsEmpty");
// Create table then get the single region for our new table. // Create table then get the single region for our new table.
TESTING_UTIL.createTable(tableName, HConstants.CATALOG_FAMILY); createTableAndWait(tableName, HConstants.CATALOG_FAMILY);
List<HRegion> regions = cluster.getRegions(tableName); List<HRegion> regions = cluster.getRegions(tableName);
HRegionInfo hri = getAndCheckSingleTableRegion(regions); HRegionInfo hri = getAndCheckSingleTableRegion(regions);
int tableRegionIndex = ensureTableRegionNotOnSameServerAsMeta(admin, hri); int tableRegionIndex = ensureTableRegionNotOnSameServerAsMeta(admin, hri);
@ -964,6 +956,17 @@ public class TestSplitTransactionOnCluster {
} }
} }
private HTable createTableAndWait(byte[] tableName, byte[] cf) throws IOException,
InterruptedException {
HTable t = TESTING_UTIL.createTable(tableName, cf);
for (int i = 0; cluster.getRegions(tableName).size() == 0 && i < 100; i++) {
Thread.sleep(100);
}
assertTrue("Table not online: " + Bytes.toString(tableName), cluster.getRegions(tableName)
.size() != 0);
return t;
}
public static class MockMasterWithoutCatalogJanitor extends HMaster { public static class MockMasterWithoutCatalogJanitor extends HMaster {
public MockMasterWithoutCatalogJanitor(Configuration conf) throws IOException, KeeperException, public MockMasterWithoutCatalogJanitor(Configuration conf) throws IOException, KeeperException,