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

HBASE-23864 No need to submit SplitTableRegionProcedure/MergeTableRegionsProcedure when split/merge is disabled (addendum)

This commit is contained in:
Guanghao Zhang 2020-02-22 18:51:02 +08:00
parent 400b7ce954
commit 418234356f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -1945,7 +1945,8 @@ public class HMaster extends HRegionServer implements MasterServices {
if (!isSplitOrMergeEnabled(MasterSwitchType.MERGE)) {
String regionsStr = Arrays.deepToString(regionsToMerge);
LOG.warn("Merge switch is off! skip merge of " + regionsStr);
throw new IOException("Merge of " + regionsStr + " failed because merge switch is off");
throw new DoNotRetryIOException("Merge of " + regionsStr +
" failed because merge switch is off");
}
final String mergeRegionsStr = Arrays.stream(regionsToMerge).
@ -1976,7 +1977,7 @@ public class HMaster extends HRegionServer implements MasterServices {
if (!isSplitOrMergeEnabled(MasterSwitchType.SPLIT)) {
LOG.warn("Split switch is off! skip split of " + regionInfo);
throw new IOException("Split region " + regionInfo.getRegionNameAsString() +
throw new DoNotRetryIOException("Split region " + regionInfo.getRegionNameAsString() +
" failed due to split switch off");
}

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

@ -1011,7 +1011,7 @@ public class AssignmentManager {
if (!master.isSplitOrMergeEnabled(MasterSwitchType.SPLIT)) {
LOG.warn("Split switch is off! skip split of " + parent);
throw new IOException("Split region " + parent.getRegionNameAsString() +
throw new DoNotRetryIOException("Split region " + parent.getRegionNameAsString() +
" failed due to split switch off");
}
@ -1042,7 +1042,7 @@ public class AssignmentManager {
if (!master.isSplitOrMergeEnabled(MasterSwitchType.MERGE)) {
LOG.warn("Merge switch is off! skip merge of regionA=" + hriA + " regionB=" + hriB);
throw new IOException("Merge of regionA=" + hriA + " regionB=" + hriB +
throw new DoNotRetryIOException("Merge of regionA=" + hriA + " regionB=" + hriB +
" failed because merge switch is off");
}