HBASE-20049 Region replicas of SPLIT and MERGED regions are kept in in-memory states until restarting master
Signed-off-by: tedyu <yuzhihong@gmail.com>
This commit is contained in:
parent
51f7b75f1f
commit
1bc996aa50
|
@ -331,6 +331,7 @@ message UnassignRegionStateData {
|
|||
// server we will send the unassign rpc too.
|
||||
optional ServerName hosting_server = 5;
|
||||
optional bool force = 4 [default = false];
|
||||
optional bool remove_after_unassigning = 6 [default = false];
|
||||
}
|
||||
|
||||
enum MoveRegionState {
|
||||
|
|
|
@ -733,11 +733,17 @@ public class AssignmentManager implements ServerListener {
|
|||
|
||||
UnassignProcedure createUnassignProcedure(final RegionInfo regionInfo,
|
||||
final ServerName destinationServer, final boolean force) {
|
||||
return createUnassignProcedure(regionInfo, destinationServer, force, false);
|
||||
}
|
||||
|
||||
UnassignProcedure createUnassignProcedure(final RegionInfo regionInfo,
|
||||
final ServerName destinationServer, final boolean force,
|
||||
final boolean removeAfterUnassigning) {
|
||||
// If destinationServer is null, figure it.
|
||||
ServerName sn = destinationServer != null? destinationServer:
|
||||
getRegionStates().getRegionState(regionInfo).getServerName();
|
||||
assert sn != null;
|
||||
UnassignProcedure proc = new UnassignProcedure(regionInfo, sn, force);
|
||||
UnassignProcedure proc = new UnassignProcedure(regionInfo, sn, force, removeAfterUnassigning);
|
||||
proc.setOwner(getProcedureEnvironment().getRequestUser().getShortName());
|
||||
return proc;
|
||||
}
|
||||
|
|
|
@ -682,7 +682,8 @@ public class MergeTableRegionsProcedure
|
|||
for (int i = 0; i < regionsToMerge.length; ++i) {
|
||||
for (int j = 0; j < regionReplication; ++j) {
|
||||
final RegionInfo hri = RegionReplicaUtil.getRegionInfoForReplica(regionsToMerge[i], j);
|
||||
procs[procsIdx++] = env.getAssignmentManager().createUnassignProcedure(hri,null,true);
|
||||
procs[procsIdx++] = env.getAssignmentManager().
|
||||
createUnassignProcedure(hri, null, true, !RegionReplicaUtil.isDefaultReplica(hri));
|
||||
}
|
||||
}
|
||||
return procs;
|
||||
|
|
|
@ -793,7 +793,8 @@ public class SplitTableRegionProcedure
|
|||
final UnassignProcedure[] procs = new UnassignProcedure[regionReplication];
|
||||
for (int i = 0; i < procs.length; ++i) {
|
||||
final RegionInfo hri = RegionReplicaUtil.getRegionInfoForReplica(getParentRegion(), i);
|
||||
procs[i] = env.getAssignmentManager().createUnassignProcedure(hri, null, true);
|
||||
procs[i] = env.getAssignmentManager().
|
||||
createUnassignProcedure(hri, null, true, !RegionReplicaUtil.isDefaultReplica(hri));
|
||||
}
|
||||
return procs;
|
||||
}
|
||||
|
|
|
@ -26,6 +26,7 @@ import org.apache.hadoop.hbase.NotServingRegionException;
|
|||
import org.apache.hadoop.hbase.ServerName;
|
||||
import org.apache.hadoop.hbase.client.RegionInfo;
|
||||
import org.apache.hadoop.hbase.exceptions.UnexpectedStateException;
|
||||
import org.apache.hadoop.hbase.favored.FavoredNodesManager;
|
||||
import org.apache.hadoop.hbase.ipc.ServerNotRunningYetException;
|
||||
import org.apache.hadoop.hbase.master.RegionState.State;
|
||||
import org.apache.hadoop.hbase.master.assignment.RegionStates.RegionStateNode;
|
||||
|
@ -40,6 +41,7 @@ import org.apache.hadoop.hbase.regionserver.RegionServerStoppedException;
|
|||
import org.apache.yetus.audience.InterfaceAudience;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
|
||||
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
|
||||
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.RegionTransitionState;
|
||||
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.UnassignRegionStateData;
|
||||
|
@ -86,22 +88,34 @@ public class UnassignProcedure extends RegionTransitionProcedure {
|
|||
// ...and keep unassign for 'disable' case?
|
||||
private boolean force;
|
||||
|
||||
/**
|
||||
* Whether deleting the region from in-memory states after unassigning the region.
|
||||
*/
|
||||
private boolean removeAfterUnassigning;
|
||||
|
||||
public UnassignProcedure() {
|
||||
// Required by the Procedure framework to create the procedure on replay
|
||||
super();
|
||||
}
|
||||
|
||||
public UnassignProcedure(final RegionInfo regionInfo, final ServerName hostingServer,
|
||||
final boolean force) {
|
||||
this(regionInfo, hostingServer, null, force);
|
||||
final boolean force, final boolean removeAfterUnassigning) {
|
||||
this(regionInfo, hostingServer, null, force, removeAfterUnassigning);
|
||||
}
|
||||
|
||||
public UnassignProcedure(final RegionInfo regionInfo,
|
||||
final ServerName hostingServer, final ServerName destinationServer, final boolean force) {
|
||||
this(regionInfo, hostingServer, destinationServer, force, false);
|
||||
}
|
||||
|
||||
public UnassignProcedure(final RegionInfo regionInfo, final ServerName hostingServer,
|
||||
final ServerName destinationServer, final boolean force,
|
||||
final boolean removeAfterUnassigning) {
|
||||
super(regionInfo);
|
||||
this.hostingServer = hostingServer;
|
||||
this.destinationServer = destinationServer;
|
||||
this.force = force;
|
||||
this.removeAfterUnassigning = removeAfterUnassigning;
|
||||
|
||||
// we don't need REGION_TRANSITION_QUEUE, we jump directly to sending the request
|
||||
setTransitionState(RegionTransitionState.REGION_TRANSITION_DISPATCH);
|
||||
|
@ -136,6 +150,9 @@ public class UnassignProcedure extends RegionTransitionProcedure {
|
|||
if (force) {
|
||||
state.setForce(true);
|
||||
}
|
||||
if (removeAfterUnassigning) {
|
||||
state.setRemoveAfterUnassigning(true);
|
||||
}
|
||||
serializer.serialize(state.build());
|
||||
}
|
||||
|
||||
|
@ -151,6 +168,7 @@ public class UnassignProcedure extends RegionTransitionProcedure {
|
|||
if (state.hasDestinationServer()) {
|
||||
this.destinationServer = ProtobufUtil.toServerName(state.getDestinationServer());
|
||||
}
|
||||
removeAfterUnassigning = state.getRemoveAfterUnassigning();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -190,7 +208,20 @@ public class UnassignProcedure extends RegionTransitionProcedure {
|
|||
@Override
|
||||
protected void finishTransition(final MasterProcedureEnv env, final RegionStateNode regionNode)
|
||||
throws IOException {
|
||||
env.getAssignmentManager().markRegionAsClosed(regionNode);
|
||||
AssignmentManager am = env.getAssignmentManager();
|
||||
RegionInfo regionInfo = getRegionInfo();
|
||||
|
||||
if (!removeAfterUnassigning) {
|
||||
am.markRegionAsClosed(regionNode);
|
||||
} else {
|
||||
// Remove from in-memory states
|
||||
am.getRegionStates().deleteRegion(regionInfo);
|
||||
env.getMasterServices().getServerManager().removeRegion(regionInfo);
|
||||
FavoredNodesManager fnm = env.getMasterServices().getFavoredNodesManager();
|
||||
if (fnm != null) {
|
||||
fnm.deleteFavoredNodesForRegions(Lists.newArrayList(regionInfo));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in New Issue