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

HBASE-15058 AssignmentManager should account for unsuccessful split correctly which initially passes quota check

This commit is contained in:
tedyu 2016-01-05 06:24:42 -08:00
parent 2797adf45f
commit 407cda4a0c
1 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
View File

@ -3720,7 +3720,7 @@ public class AssignmentManager extends ZooKeeperListener {
invokeAssign(hri, false);
}
private String onRegionSplit(ServerName sn, TransitionCode code,
private String checkInStateForSplit(ServerName sn,
final HRegionInfo p, final HRegionInfo a, final HRegionInfo b) {
final RegionState rs_p = regionStates.getRegionState(p);
RegionState rs_a = regionStates.getRegionState(a);
@ -3730,6 +3730,32 @@ public class AssignmentManager extends ZooKeeperListener {
&& (rs_b == null || rs_b.isOpenOrSplittingNewOnServer(sn)))) {
return "Not in state good for split";
}
return "";
}
private String onRegionSplitReverted(ServerName sn,
final HRegionInfo p, final HRegionInfo a, final HRegionInfo b) {
String s = checkInStateForSplit(sn, p, a, b);
if (!org.apache.commons.lang.StringUtils.isEmpty(s)) {
return s;
}
regionOnline(p, sn);
regionOffline(a);
regionOffline(b);
if (getTableStateManager().isTableState(p.getTable(),
ZooKeeperProtos.Table.State.DISABLED, ZooKeeperProtos.Table.State.DISABLING)) {
invokeUnAssign(p);
}
return null;
}
private String onRegionSplit(ServerName sn, TransitionCode code,
final HRegionInfo p, final HRegionInfo a, final HRegionInfo b) {
String s = checkInStateForSplit(sn, p, a, b);
if (!org.apache.commons.lang.StringUtils.isEmpty(s)) {
return s;
}
regionStates.updateRegionState(a, State.SPLITTING_NEW, sn);
regionStates.updateRegionState(b, State.SPLITTING_NEW, sn);
@ -3765,15 +3791,6 @@ public class AssignmentManager extends ZooKeeperListener {
LOG.info("Failed to record split region " + p.getShortNameToLog());
return "Failed to record the splitting in meta";
}
} else if (code == TransitionCode.SPLIT_REVERTED) {
regionOnline(p, sn);
regionOffline(a);
regionOffline(b);
if (getTableStateManager().isTableState(p.getTable(),
ZooKeeperProtos.Table.State.DISABLED, ZooKeeperProtos.Table.State.DISABLING)) {
invokeUnAssign(p);
}
}
return null;
}
@ -4338,11 +4355,18 @@ public class AssignmentManager extends ZooKeeperListener {
} catch (IOException exp) {
errorMsg = StringUtils.stringifyException(exp);
}
break;
case SPLIT_PONR:
case SPLIT:
errorMsg =
onRegionSplit(serverName, code, hri, HRegionInfo.convert(transition.getRegionInfo(1)),
HRegionInfo.convert(transition.getRegionInfo(2)));
break;
case SPLIT_REVERTED:
errorMsg =
onRegionSplit(serverName, code, hri, HRegionInfo.convert(transition.getRegionInfo(1)),
onRegionSplitReverted(serverName, hri,
HRegionInfo.convert(transition.getRegionInfo(1)),
HRegionInfo.convert(transition.getRegionInfo(2)));
if (org.apache.commons.lang.StringUtils.isEmpty(errorMsg)) {
try {