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

HBASE-20160 TestRestartCluster.testRetainAssignmentOnRestart uses the wrong condition to decide whether the assignment is finished

This commit is contained in:
zhangduo 2018-03-08 18:03:04 +08:00
parent c99e6f7439
commit b4e297f3f6
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
View File

@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableExistsException; import org.apache.hadoop.hbase.TableExistsException;
import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.master.assignment.RegionStates;
import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Bytes;
@ -45,7 +44,7 @@ import org.junit.experimental.categories.Category;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@Category({MasterTests.class, LargeTests.class}) @Category({ MasterTests.class, LargeTests.class })
public class TestRestartCluster { public class TestRestartCluster {
@ClassRule @ClassRule
@ -60,7 +59,7 @@ public class TestRestartCluster {
TableName.valueOf("restartTableTwo"), TableName.valueOf("restartTableTwo"),
TableName.valueOf("restartTableThree") TableName.valueOf("restartTableThree")
}; };
private static final byte [] FAMILY = Bytes.toBytes("family"); private static final byte[] FAMILY = Bytes.toBytes("family");
@After public void tearDown() throws Exception { @After public void tearDown() throws Exception {
UTIL.shutdownMiniCluster(); UTIL.shutdownMiniCluster();
@ -115,17 +114,13 @@ public class TestRestartCluster {
@Test @Test
public void testRetainAssignmentOnRestart() throws Exception { public void testRetainAssignmentOnRestart() throws Exception {
UTIL.startMiniCluster(2); UTIL.startMiniCluster(2);
while (!UTIL.getMiniHBaseCluster().getMaster().isInitialized()) {
Threads.sleep(1);
}
// Turn off balancer // Turn off balancer
UTIL.getMiniHBaseCluster().getMaster(). UTIL.getMiniHBaseCluster().getMaster().getMasterRpcServices().synchronousBalanceSwitch(false);
getMasterRpcServices().synchronousBalanceSwitch(false);
LOG.info("\n\nCreating tables"); LOG.info("\n\nCreating tables");
for(TableName TABLE : TABLES) { for (TableName TABLE : TABLES) {
UTIL.createTable(TABLE, FAMILY); UTIL.createTable(TABLE, FAMILY);
} }
for(TableName TABLE : TABLES) { for (TableName TABLE : TABLES) {
UTIL.waitTableEnabled(TABLE); UTIL.waitTableEnabled(TABLE);
} }
@ -157,6 +152,7 @@ public class TestRestartCluster {
} }
LOG.info("\n\nShutting down HBase cluster"); LOG.info("\n\nShutting down HBase cluster");
cluster.stopMaster(0);
cluster.shutdown(); cluster.shutdown();
cluster.waitUntilShutDown(); cluster.waitUntilShutDown();
@ -194,11 +190,8 @@ public class TestRestartCluster {
} }
// Wait till master is initialized and all regions are assigned // Wait till master is initialized and all regions are assigned
RegionStates regionStates = master.getAssignmentManager().getRegionStates(); for (TableName TABLE : TABLES) {
int expectedRegions = regionToRegionServerMap.size() + 1; UTIL.waitTableAvailable(TABLE);
while (!master.isInitialized()
|| regionStates.getRegionAssignments().size() != expectedRegions) {
Threads.sleep(100);
} }
snapshot = new SnapshotOfRegionAssignmentFromMeta(master.getConnection()); snapshot = new SnapshotOfRegionAssignmentFromMeta(master.getConnection());
@ -206,11 +199,14 @@ public class TestRestartCluster {
Map<RegionInfo, ServerName> newRegionToRegionServerMap = Map<RegionInfo, ServerName> newRegionToRegionServerMap =
snapshot.getRegionToRegionServerMap(); snapshot.getRegionToRegionServerMap();
assertEquals(regionToRegionServerMap.size(), newRegionToRegionServerMap.size()); assertEquals(regionToRegionServerMap.size(), newRegionToRegionServerMap.size());
for (Map.Entry<RegionInfo, ServerName> entry: newRegionToRegionServerMap.entrySet()) { for (Map.Entry<RegionInfo, ServerName> entry : newRegionToRegionServerMap.entrySet()) {
if (TableName.NAMESPACE_TABLE_NAME.equals(entry.getKey().getTable())) continue; if (TableName.NAMESPACE_TABLE_NAME.equals(entry.getKey().getTable())) {
continue;
}
ServerName oldServer = regionToRegionServerMap.get(entry.getKey()); ServerName oldServer = regionToRegionServerMap.get(entry.getKey());
ServerName currentServer = entry.getValue(); ServerName currentServer = entry.getValue();
LOG.info("Key=" + entry.getKey() + " oldServer=" + oldServer + ", currentServer=" + currentServer); LOG.info(
"Key=" + entry.getKey() + " oldServer=" + oldServer + ", currentServer=" + currentServer);
assertEquals(entry.getKey().toString(), oldServer.getAddress(), currentServer.getAddress()); assertEquals(entry.getKey().toString(), oldServer.getAddress(), currentServer.getAddress());
assertNotEquals(oldServer.getStartcode(), currentServer.getStartcode()); assertNotEquals(oldServer.getStartcode(), currentServer.getStartcode());
} }