xcangCRM commented on a change in pull request #387: HBASE-22642 Make move
operations of RSGroup idempotent
URL: https://github.com/apache/hbase/pull/387#discussion_r304183039
##########
File path:
hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin2.java
##########
@@ -652,24 +614,156 @@ public boolean evaluate() throws Exception {
RSGroupInfo newGroup) throws IOException{
// get target server to move, which should has more than one regions
// randomly set a region state to SPLITTING to make move fail
- Map<ServerName, List<String>> assignMap =
getTableServerRegionMap().get(tableName);
- String rregion = null;
- ServerName toMoveServer = null;
+ return randomlySetRegionState(newGroup,
RegionState.State.SPLITTING,tableName);
+ }
+
+ private Pair<ServerName, RegionStateNode> randomlySetRegionState(RSGroupInfo
groupInfo,
+ RegionState.State state, TableName... tableNames) throws IOException {
+ Preconditions.checkArgument(tableNames.length == 1 || tableNames.length ==
2,
+ "only support one or two tables");
+ Map<ServerName, List<String>> assignMap =
getTableServerRegionMap().get(tableNames[0]);
+ if(tableNames.length == 2) {
+ Map<ServerName, List<String>> assignMap2 =
getTableServerRegionMap().get(tableNames[1]);
+ assignMap2.forEach((k ,v) -> {
+ if(!assignMap.containsKey(k)) {
+ assignMap.remove(k);
+ }
+ });
+ }
+ String toCorrectRegionName = null;
+ ServerName srcServer = null;
for (ServerName server : assignMap.keySet()) {
- rregion = assignMap.get(server).size() > 1 &&
- !newGroup.containsServer(server.getAddress()) ?
assignMap.get(server).get(0) : null;
- if (rregion != null) {
- toMoveServer = server;
+ toCorrectRegionName = assignMap.get(server).size() >= 1 &&
+ !groupInfo.containsServer(server.getAddress()) ?
assignMap.get(server).get(0) : null;
+ if (toCorrectRegionName != null) {
+ srcServer = server;
break;
}
}
- assert toMoveServer != null;
- RegionInfo ri =
TEST_UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager().
- getRegionInfo(Bytes.toBytesBinary(rregion));
+ assert srcServer != null;
+ RegionInfo toCorrectRegionInfo =
TEST_UTIL.getMiniHBaseCluster().getMaster()
+
.getAssignmentManager().getRegionInfo(Bytes.toBytesBinary(toCorrectRegionName));
RegionStateNode rsn =
TEST_UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager().getRegionStates()
- .getRegionStateNode(ri);
- rsn.setState(RegionState.State.SPLITTING);
- return new Pair<>(toMoveServer, rsn);
+ .getRegionStateNode(toCorrectRegionInfo);
+ rsn.setState(state);
+ return new Pair<>(srcServer, rsn);
+ }
+
+ @Test
+ public void testFailedMoveTablesAndRepair() throws Exception{
+ final RSGroupInfo newGroup = addGroup(getGroupName(name.getMethodName()),
1);
+ Iterator iterator = newGroup.getServers().iterator();
+ Address newGroupServer1 = (Address) iterator.next();
+
+ // create table
+ // randomly set a region state to SPLITTING to make move abort
+ Pair<ServerName, RegionStateNode> gotPair =
createTableWithRegionSplitting(newGroup,
+ new Random().nextInt(8) + 4);
+ RegionStateNode rsn = gotPair.getSecond();
+
+ // move table to newGroup and check regions
+ try {
+ rsGroupAdmin.moveTables(Sets.newHashSet(tableName), newGroup.getName());
+ fail("should get IOException when retry exhausted but there still exists
failed moved "
+ + "regions");
+ }catch (Exception e){
+ assertTrue(e.getMessage().contains(
+ gotPair.getSecond().getRegionInfo().getRegionNameAsString()));
+ }
+ for(RegionInfo regionInfo :
master.getAssignmentManager().getAssignedRegions()){
+ if (regionInfo.getTable().equals(tableName) &&
regionInfo.equals(rsn.getRegionInfo())) {
+ assertNotEquals(master.getAssignmentManager().getRegionStates()
+ .getRegionServerOfRegion(regionInfo).getAddress(),
newGroupServer1);
+ }
+ }
+
+ // retry move table to newGroup adn check if all regions are corrected
+ rsn.setState(RegionState.State.OPEN);
+ rsGroupAdmin.moveTables(Sets.newHashSet(tableName), newGroup.getName());
+ for(RegionInfo regionInfo :
master.getAssignmentManager().getAssignedRegions()){
+ if (regionInfo.getTable().equals(tableName)) {
+ assertEquals(master.getAssignmentManager().getRegionStates()
+ .getRegionServerOfRegion(regionInfo).getAddress(),
newGroupServer1);
+ }
+ }
+ }
+
+ @Test
+ public void testFailedMoveServersAndRepair() throws Exception{
+ final RSGroupInfo newGroup = addGroup(getGroupName(name.getMethodName()),
1);
+
+ // create table
+ // randomly set a region state to SPLITTING to make move abort
+ Pair<ServerName, RegionStateNode> gotPair =
createTableWithRegionSplitting(newGroup,
+ new Random().nextInt(8) + 4);
+ RegionStateNode rsn = gotPair.getSecond();
+ ServerName srcServer = rsn.getRegionLocation();
+
+ // move server to newGroup and check regions
+ try {
+ rsGroupAdmin.moveServers(Sets.newHashSet(srcServer.getAddress()),
newGroup.getName());
+ fail("should get IOException when retry exhausted but there still exists
failed moved "
+ + "regions");
+ }catch (Exception e){
+ assertTrue(e.getMessage().contains(
+ gotPair.getSecond().getRegionInfo().getRegionNameAsString()));
+ }
+ for(RegionInfo regionInfo :
master.getAssignmentManager().getAssignedRegions()){
+ if (regionInfo.getTable().equals(tableName) &&
regionInfo.equals(rsn.getRegionInfo())) {
+ assertEquals(master.getAssignmentManager().getRegionStates()
+ .getRegionServerOfRegion(regionInfo), srcServer);
+ }
+ }
+
+ // retry move server to newGroup adn check if all regions on srcServer was
moved
Review comment:
typo: adn -> and ?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
