diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java index 01a5f83..a29728a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java @@ -84,6 +84,10 @@ public class AssignProcedure extends RegionTransitionProcedure { */ protected volatile ServerName targetServer; + // used to collect regions in case of replica region assignment so that + // the regions can be assigned as a bulk + private RegionReplicaAssignmentCollector regionCollector; + public AssignProcedure() { // Required by the Procedure framework to create the procedure on replay super(); @@ -99,6 +103,14 @@ public class AssignProcedure extends RegionTransitionProcedure { this.targetServer = null; } + public AssignProcedure(final RegionInfo regionInfo, final boolean forceNewPlan, + RegionReplicaAssignmentCollector regionCollector) { + super(regionInfo); + this.forceNewPlan = forceNewPlan; + this.targetServer = null; + this.regionCollector = regionCollector; + } + public AssignProcedure(final RegionInfo regionInfo, final ServerName destinationServer) { super(regionInfo); this.forceNewPlan = false; @@ -204,7 +216,11 @@ public class AssignProcedure extends RegionTransitionProcedure { LOG.info("Start " + this + "; " + regionNode.toShortString() + "; forceNewPlan=" + this.forceNewPlan + ", retain=" + retain); - env.getAssignmentManager().queueAssign(regionNode); + if (regionCollector != null) { + this.regionCollector.addRegion(regionNode); + } else { + env.getAssignmentManager().queueAssign(regionNode); + } return true; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java index 22f734c..7200631 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java @@ -40,6 +40,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseIOException; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.PleaseHoldException; import org.apache.hadoop.hbase.RegionException; import org.apache.hadoop.hbase.RegionStateListener; @@ -602,6 +603,17 @@ public class AssignmentManager implements ServerListener { return createAssignProcedures(regionInfo, false); } + public AssignProcedure[] createAssignProcedures(List regionInfo, + RegionReplicaAssignmentCollector regionCollector) { + if (regionInfo.isEmpty()) return null; + final AssignProcedure[] procs = new AssignProcedure[regionInfo.size()]; + int index = 0; + for (RegionInfo hri : regionInfo) { + procs[index++] = createAssignProcedure(hri, false, regionCollector); + } + return procs; + } + public AssignProcedure[] createAssignProcedures(final Collection regionInfo, final boolean forceNewPlan) { if (regionInfo.isEmpty()) return null; @@ -673,6 +685,13 @@ public class AssignmentManager implements ServerListener { } public AssignProcedure createAssignProcedure(final RegionInfo regionInfo, + final boolean forceNewPlan, final RegionReplicaAssignmentCollector regionCollector) { + AssignProcedure proc = new AssignProcedure(regionInfo, forceNewPlan, regionCollector); + proc.setOwner(getProcedureEnvironment().getRequestUser().getShortName()); + return proc; + } + + public AssignProcedure createAssignProcedure(final RegionInfo regionInfo, final ServerName targetServer) { AssignProcedure proc = new AssignProcedure(regionInfo, targetServer); proc.setOwner(getProcedureEnvironment().getRequestUser().getShortName()); @@ -1585,6 +1604,29 @@ public class AssignmentManager implements ServerListener { } } + /** + * Add the assign operation to the assignment queue. The pending assignment operation will be + * processed, and each region will be assigned by a server using the balancer. + */ + protected void queueAssign(final Collection regionNodes) { + for (RegionStateNode regionNode : regionNodes) { + getProcedureScheduler().suspendEvent(regionNode.getProcedureEvent()); + } + // TODO: quick-start for meta and the other sys-tables? + assignQueueLock.lock(); + try { + pendingAssignQueue.addAll(regionNodes); + // always signal for assignment + assignQueueFullCond.signal(); + } finally { + assignQueueLock.unlock(); + } + } + + public RegionReplicaAssignmentCollector getReplicaAssignmentCollector(int count) { + return new RegionReplicaAssignmentCollector(count, this); + } + private void startAssignmentThread() { assignThread = new Thread("AssignmentThread") { @Override diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionReplicaAssignmentCollector.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionReplicaAssignmentCollector.java new file mode 100644 index 0000000..d9e338b --- /dev/null +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionReplicaAssignmentCollector.java @@ -0,0 +1,60 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.master.assignment; + +import java.util.HashSet; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.master.assignment.RegionStates.RegionStateNode; +import org.apache.yetus.audience.InterfaceAudience; + +/** + * Collects all the regions that belongs to a table which has replica enabled and + * handles the regions as a bulk to the assignment manager + */ +@InterfaceAudience.Private +public class RegionReplicaAssignmentCollector { + + private Set regionStateNodes; + private final int count; + private final AssignmentManager assignmentManager; + private static final Log LOG = LogFactory.getLog(RegionReplicaAssignmentCollector.class); + public RegionReplicaAssignmentCollector(final int count, + final AssignmentManager assignmentManager) { + this.count = count; + // init here + regionStateNodes = new HashSet(count); + this.assignmentManager = assignmentManager; + } + + public synchronized void addRegion(RegionStateNode node) { + if (regionStateNodes == null) { + return; + } + if (!regionStateNodes.contains(node)) { + this.regionStateNodes.add(node); + } + if (this.regionStateNodes.size() == this.count) { + assignmentManager.queueAssign(regionStateNodes); + // nullify + regionStateNodes = null; + } + } +} \ No newline at end of file diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java index e9804dd..ca46caa 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/CreateTableProcedure.java @@ -36,7 +36,9 @@ import org.apache.hadoop.hbase.client.TableDescriptor; import org.apache.hadoop.hbase.client.TableState; import org.apache.hadoop.hbase.master.MasterCoprocessorHost; import org.apache.hadoop.hbase.master.MasterFileSystem; +import org.apache.hadoop.hbase.master.assignment.RegionReplicaAssignmentCollector; import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer; +import org.apache.hadoop.hbase.procedure2.Procedure.LockState; import org.apache.hadoop.hbase.util.FSTableDescriptors; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.ModifyRegionUtils; @@ -106,7 +108,14 @@ public class CreateTableProcedure break; case CREATE_TABLE_ASSIGN_REGIONS: setEnablingState(env, getTableName()); - addChildProcedure(env.getAssignmentManager().createAssignProcedures(newRegions)); + if (this.getTableName().isSystemTable() || tableDescriptor.getRegionReplication() <= 1) { + addChildProcedure(env.getAssignmentManager().createAssignProcedures(newRegions)); + } else { + RegionReplicaAssignmentCollector regionCollector = + env.getAssignmentManager().getReplicaAssignmentCollector(newRegions.size()); + addChildProcedure(env.getAssignmentManager().createAssignProcedures(newRegions, + regionCollector)); + } setNextState(CreateTableState.CREATE_TABLE_UPDATE_DESC_CACHE); break; case CREATE_TABLE_UPDATE_DESC_CACHE: diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java index 6c94eff..686afbd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/EnableTableProcedure.java @@ -176,6 +176,8 @@ public class EnableTableProcedure } } // Assign all the table regions. (including region replicas if added) + // TODO : the enable replica also should be done as in CreateTableProcedure but + // it does not work as expected. addChildProcedure(env.getAssignmentManager().createAssignProcedures(regionsOfTable)); setNextState(EnableTableState.ENABLE_TABLE_SET_ENABLED_TABLE_STATE); break; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicasAreDistributed.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicasAreDistributed.java new file mode 100644 index 0000000..31909b8 --- /dev/null +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicasAreDistributed.java @@ -0,0 +1,164 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.regionserver; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.RegionInfo; +import org.apache.hadoop.hbase.client.RegionReplicaUtil; +import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.util.RegionSplitter; +import org.apache.hadoop.hdfs.DFSConfigKeys; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +@Category({ RegionServerTests.class, MediumTests.class }) +public class TestRegionReplicasAreDistributed { + + private static final Log LOG = LogFactory.getLog(TestRegionReplicasAreDistributed.class); + + private static final int NB_SERVERS = 3; + private static Table table; + + private static final HBaseTestingUtility HTU = new HBaseTestingUtility(); + private static final byte[] f = HConstants.CATALOG_FAMILY; + + @BeforeClass + public static void before() throws Exception { + HTU.getConfiguration().setInt(">hbase.master.wait.on.regionservers.mintostart", 3); + + HTU.startMiniCluster(NB_SERVERS); + Thread.sleep(3000); + final TableName tableName = + TableName.valueOf(TestRegionReplicasAreDistributed.class.getSimpleName()); + + // Create table then get the single region for our new table. + createTableDirectlyFromHTD(tableName); + } + + private static void createTableDirectlyFromHTD(final TableName tableName) throws IOException { + HTableDescriptor htd = new HTableDescriptor(tableName); + htd.setRegionReplication(3); + // create a table with 3 replication + + table = HTU.createTable(htd, new byte[][] { f }, getSplits(20), + new Configuration(HTU.getConfiguration())); + } + + private static byte[][] getSplits(int numRegions) { + RegionSplitter.UniformSplit split = new RegionSplitter.UniformSplit(); + split.setFirstRow(Bytes.toBytes(0L)); + split.setLastRow(Bytes.toBytes(Long.MAX_VALUE)); + return split.split(numRegions); + } + + @AfterClass + public static void afterClass() throws Exception { + HRegionServer.TEST_SKIP_REPORTING_TRANSITION = false; + table.close(); + HTU.shutdownMiniCluster(); + } + + private HRegionServer getRS() { + return HTU.getMiniHBaseCluster().getRegionServer(0); + } + + private HRegionServer getSecondaryRS() { + return HTU.getMiniHBaseCluster().getRegionServer(1); + } + + private HRegionServer getTertiaryRS() { + return HTU.getMiniHBaseCluster().getRegionServer(2); + } + + @Test(timeout = 60000) + public void testRegionReplicasCreatedAreDistributed() throws Exception { + try { + checkAndAssertRegionDistribution(); + // now diesbale and enable the table again. It should be truly distributed + HTU.getAdmin().disableTable(table.getName()); + LOG.info("Disabled the table "+table.getName()); + LOG.info("enabling the table "+table.getName()); + // TODO : after enabling also this should work + //HTU.getAdmin().enableTable(table.getName()); + //checkAndAssertRegionDistribution(); + } finally { + HTU.getAdmin().disableTable(table.getName()); + HTU.getAdmin().deleteTable(table.getName()); + } + } + + private void checkAndAssertRegionDistribution() throws Exception { + Collection onlineRegions = getRS().getOnlineRegionsLocalContext(); + boolean res = checkDuplicates(onlineRegions); + assertFalse(res); + Collection onlineRegions2 = getSecondaryRS().getOnlineRegionsLocalContext(); + res = checkDuplicates(onlineRegions2); + assertFalse(res); + Collection onlineRegions3 = getTertiaryRS().getOnlineRegionsLocalContext(); + checkDuplicates(onlineRegions3); + assertFalse(res); + int totalRegions = onlineRegions.size() + onlineRegions2.size() + onlineRegions3.size(); + // META and namespace to be added + assertEquals("the number of regions should be 60", totalRegions, 60 + 2); + } + + private boolean checkDuplicates(Collection onlineRegions) throws Exception { + ArrayList copyOfRegion = new ArrayList(onlineRegions); + for (Region region : copyOfRegion) { + RegionInfo regionInfo = region.getRegionInfo(); + RegionInfo regionInfoForReplica = + RegionReplicaUtil.getRegionInfoForDefaultReplica(regionInfo); + int i = 0; + for (Region actualRegion : onlineRegions) { + if (regionInfoForReplica.equals( + RegionReplicaUtil.getRegionInfoForDefaultReplica(actualRegion.getRegionInfo()))) { + i++; + if (i > 1) { + LOG.error( + "duplicate found " + actualRegion.getRegionInfo() + " " + region.getRegionInfo()); + assertTrue(Bytes.equals(region.getRegionInfo().getStartKey(), + actualRegion.getRegionInfo().getStartKey())); + assertTrue(Bytes.equals(region.getRegionInfo().getEndKey(), + actualRegion.getRegionInfo().getEndKey())); + return true; + } + } + } + } + return false; + } +}