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

HBASE-13463 Quota needs to be updated only in case of successful region merge

This commit is contained in:
tedyu 2015-04-16 11:08:54 -07:00
parent a778c38ab4
commit 8ce7f905d2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4236,15 +4236,17 @@ public class AssignmentManager extends ZooKeeperListener {
case READY_TO_MERGE: case READY_TO_MERGE:
case MERGE_PONR: case MERGE_PONR:
case MERGED: case MERGED:
case MERGE_REVERTED:
errorMsg = onRegionMerge(serverName, code, hri,
HRegionInfo.convert(transition.getRegionInfo(1)),
HRegionInfo.convert(transition.getRegionInfo(2)));
if (code == TransitionCode.MERGED && org.apache.commons.lang.StringUtils.isEmpty(errorMsg)) {
try { try {
regionStateListener.onRegionMerged(hri); regionStateListener.onRegionMerged(hri);
} catch (IOException exp) { } catch (IOException exp) {
errorMsg = StringUtils.stringifyException(exp); errorMsg = StringUtils.stringifyException(exp);
} }
case MERGE_REVERTED: }
errorMsg = onRegionMerge(serverName, code, hri,
HRegionInfo.convert(transition.getRegionInfo(1)),
HRegionInfo.convert(transition.getRegionInfo(2)));
break; break;
default: default: