You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2020/08/21 14:41:47 UTC
[hbase] branch branch-2.3 updated: HBASE-24926 Should call
setFailure in MergeTableRegionsProcedure when isMergeable returns false
(#2290)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.3 by this push:
new d2b530a HBASE-24926 Should call setFailure in MergeTableRegionsProcedure when isMergeable returns false (#2290)
d2b530a is described below
commit d2b530a7868d2fad1df5baf6d40a7a2970c832bd
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Fri Aug 21 22:01:33 2020 +0800
HBASE-24926 Should call setFailure in MergeTableRegionsProcedure when isMergeable returns false (#2290)
Signed-off-by: Viraj Jasani <vj...@apache.org>
---
.../hbase/master/assignment/MergeTableRegionsProcedure.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java
index 13b68c1..68db7b2 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java
@@ -459,7 +459,7 @@ public class MergeTableRegionsProcedure
if (!env.getMasterServices().isSplitOrMergeEnabled(MasterSwitchType.MERGE)) {
String regionsStr = Arrays.deepToString(this.regionsToMerge);
LOG.warn("Merge switch is off! skip merge of " + regionsStr);
- super.setFailure(getClass().getSimpleName(),
+ setFailure(getClass().getSimpleName(),
new IOException("Merge of " + regionsStr + " failed because merge switch is off"));
return false;
}
@@ -467,7 +467,7 @@ public class MergeTableRegionsProcedure
if (!env.getMasterServices().getTableDescriptors().get(getTableName()).isMergeEnabled()) {
String regionsStr = Arrays.deepToString(regionsToMerge);
LOG.warn("Merge is disabled for the table! Skipping merge of {}", regionsStr);
- super.setFailure(getClass().getSimpleName(), new IOException(
+ setFailure(getClass().getSimpleName(), new IOException(
"Merge of " + regionsStr + " failed as region merge is disabled for the table"));
return false;
}
@@ -496,11 +496,15 @@ public class MergeTableRegionsProcedure
// along with the failure, so we can see why regions are not mergeable at this time.
try {
if (!isMergeable(env, state)) {
+ setFailure(getClass().getSimpleName(),
+ new MergeRegionException(
+ "Skip merging " + RegionInfo.getShortNameToLog(regionsToMerge) +
+ ", because a parent, " + RegionInfo.getShortNameToLog(ri) + ", is not mergeable"));
return false;
}
} catch (IOException e) {
IOException ioe = new IOException(RegionInfo.getShortNameToLog(ri) + " NOT mergeable", e);
- super.setFailure(getClass().getSimpleName(), ioe);
+ setFailure(getClass().getSimpleName(), ioe);
return false;
}
}