From aec684fc7f0d86d5e0bdf3c46132aeba49cc5f00 Mon Sep 17 00:00:00 2001 From: Guanghao Zhang Date: Sat, 22 Feb 2020 18:51:02 +0800 Subject: [PATCH] HBASE-23864 No need to submit SplitTableRegionProcedure/MergeTableRegionsProcedure when split/merge is disabled (addendum) --- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 5 +++-- .../org/apache/hadoop/hbase/master/assignment/AssignmentManager.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 5ec5604..5a76b79 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -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"); } 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 4b5f6dc..d524c25 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 @@ -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"); } -- 1.8.3.1