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

HBASE-20741 - Split of a region with replicas creates all daughter regions 

and its replica in same server (Addendum for duo's comments in RB)
This commit is contained in:
Vasudevan 2018-09-04 16:38:09 +05:30
parent f504c4d797
commit c6a65ba63f
2 changed files with 53 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManagerUtil.java
View File

@ -50,6 +50,8 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionIn
*/ */
@InterfaceAudience.Private @InterfaceAudience.Private
final class AssignmentManagerUtil { final class AssignmentManagerUtil {
private static final int DEFAULT_REGION_REPLICA = 1;
private AssignmentManagerUtil() { private AssignmentManagerUtil() {
} }
@ -142,8 +144,6 @@ final class AssignmentManagerUtil {
List<RegionInfo> regions, int regionReplication, ServerName targetServer) { List<RegionInfo> regions, int regionReplication, ServerName targetServer) {
// create the assign procs only for the primary region using the targetServer // create the assign procs only for the primary region using the targetServer
TransitRegionStateProcedure[] primaryRegionProcs = regions.stream() TransitRegionStateProcedure[] primaryRegionProcs = regions.stream()
.flatMap(hri -> IntStream.range(0, 1) // yes, only the primary
.mapToObj(i -> RegionReplicaUtil.getRegionInfoForReplica(hri, i)))
.map(env.getAssignmentManager().getRegionStates()::getOrCreateRegionStateNode) .map(env.getAssignmentManager().getRegionStates()::getOrCreateRegionStateNode)
.map(regionNode -> { .map(regionNode -> {
TransitRegionStateProcedure proc = TransitRegionStateProcedure proc =
@ -160,7 +160,7 @@ final class AssignmentManagerUtil {
} }
return proc; return proc;
}).toArray(TransitRegionStateProcedure[]::new); }).toArray(TransitRegionStateProcedure[]::new);
if (regionReplication == 1) { if (regionReplication == DEFAULT_REGION_REPLICA) {
// this is the default case // this is the default case
return primaryRegionProcs; return primaryRegionProcs;
} }

20
hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRegionReplicaSplit.java
View File

@ -35,6 +35,8 @@ 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.client.RegionReplicaUtil; import org.apache.hadoop.hbase.client.RegionReplicaUtil;
import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.regionserver.Region; import org.apache.hadoop.hbase.regionserver.Region;
import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.LargeTests;
@ -66,24 +68,24 @@ public class TestRegionReplicaSplit {
private static final byte[] f = HConstants.CATALOG_FAMILY; private static final byte[] f = HConstants.CATALOG_FAMILY;
@BeforeClass @BeforeClass
public static void before() throws Exception { public static void beforeClass() throws Exception {
HTU.getConfiguration().setInt("hbase.master.wait.on.regionservers.mintostart", 3); HTU.getConfiguration().setInt("hbase.master.wait.on.regionservers.mintostart", 3);
HTU.startMiniCluster(NB_SERVERS); HTU.startMiniCluster(NB_SERVERS);
final TableName tableName = TableName.valueOf(TestRegionReplicaSplit.class.getSimpleName()); final TableName tableName = TableName.valueOf(TestRegionReplicaSplit.class.getSimpleName());
// Create table then get the single region for our new table. // Create table then get the single region for our new table.
createTableDirectlyFromHTD(tableName); createTable(tableName);
} }
@Rule @Rule
public TestName name = new TestName(); public TestName name = new TestName();
private static void createTableDirectlyFromHTD(final TableName tableName) throws IOException { private static void createTable(final TableName tableName) throws IOException {
HTableDescriptor htd = new HTableDescriptor(tableName); TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName);
htd.setRegionReplication(3); builder.setRegionReplication(3);
// create a table with 3 replication // create a table with 3 replication
table = HTU.createTable(htd, new byte[][] { f }, getSplits(2), table = HTU.createTable(builder.build(), new byte[][] { f }, getSplits(2),
new Configuration(HTU.getConfiguration())); new Configuration(HTU.getConfiguration()));
} }
@ -101,9 +103,7 @@ public class TestRegionReplicaSplit {
HTU.shutdownMiniCluster(); HTU.shutdownMiniCluster();
} }
@Test(timeout = 60000)
public void testRegionReplicaSplitRegionAssignment() throws Exception { public void testRegionReplicaSplitRegionAssignment() throws Exception {
try {
HTU.loadNumericRows(table, f, 0, 3); HTU.loadNumericRows(table, f, 0, 3);
// split the table // split the table
List<RegionInfo> regions = new ArrayList<RegionInfo>(); List<RegionInfo> regions = new ArrayList<RegionInfo>();
@ -155,9 +155,5 @@ public class TestRegionReplicaSplit {
// replicas will be assigned to two unique servers. // replicas will be assigned to two unique servers.
assertEquals("The new regions should be assigned to 3 unique servers ", 3, assertEquals("The new regions should be assigned to 3 unique servers ", 3,
newRegionLocations.size()); newRegionLocations.size());
} finally {
HTU.getAdmin().disableTable(table.getName());
HTU.getAdmin().deleteTable(table.getName());
}
} }
} }