You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/02/17 07:22:05 UTC
hbase git commit: Revert "HBASE-20015 TestMergeTableRegionsProcedure
and TestRegionMergeTransactionOnCluster flakey"
Repository: hbase
Updated Branches:
refs/heads/branch-2 3ea2ffcd5 -> 07bdd492f
Revert "HBASE-20015 TestMergeTableRegionsProcedure and TestRegionMergeTransactionOnCluster flakey"
This reverts commit 72193650dde2225e85d7bdb74b24ad39367145da.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/07bdd492
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/07bdd492
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/07bdd492
Branch: refs/heads/branch-2
Commit: 07bdd492f443fddba61707e2af24650b01d5e76e
Parents: 3ea2ffc
Author: Michael Stack <st...@apache.org>
Authored: Fri Feb 16 23:21:56 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Fri Feb 16 23:21:56 2018 -0800
----------------------------------------------------------------------
.../master/assignment/MergeTableRegionsProcedure.java | 14 ++++----------
.../master/assignment/SplitTableRegionProcedure.java | 1 -
2 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/07bdd492/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java
----------------------------------------------------------------------
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 baa399b..4bccab7 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
@@ -255,16 +255,10 @@ public class MergeTableRegionsProcedure
throw new UnsupportedOperationException(this + " unhandled state=" + state);
}
} catch (IOException e) {
- String msg = "Error trying to merge regions " +
- RegionInfo.getShortNameToLog(regionsToMerge) + " in the table " + getTableName() +
- " (in state=" + state + ")";
- if (!isRollbackSupported(state)) {
- // We reach a state that cannot be rolled back. We just need to keep retry.
- LOG.warn(msg, e);
- } else {
- LOG.error(msg, e);
- setFailure("master-merge-regions", e);
- }
+ LOG.warn("Error trying to merge regions " + RegionInfo.getShortNameToLog(regionsToMerge) +
+ " in the table " + getTableName() + " (in state=" + state + ")", e);
+
+ setFailure("master-merge-regions", e);
}
return Flow.HAS_MORE_STATE;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/07bdd492/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
index e898d6a..c139566 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.java
@@ -270,7 +270,6 @@ public class SplitTableRegionProcedure
} else {
LOG.error(msg, e);
setFailure(e);
- setFailure("master-split-regions", e);
}
}
// if split fails, need to call ((HRegion)parent).clearSplit() when it is a force split