You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2017/02/23 23:25:13 UTC
[4/4] hbase git commit: HBASE-17682 Region stuck in merging_new state
indefinitely
HBASE-17682 Region stuck in merging_new state indefinitely
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b0780bdc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b0780bdc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b0780bdc
Branch: refs/heads/branch-1
Commit: b0780bdc63aa8c5858c85ee4b6f999fd8a624a29
Parents: 2b6e9b3
Author: Abhishek Singh Chouhan <ab...@gmail.com>
Authored: Thu Feb 23 18:13:06 2017 +0530
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Feb 23 15:19:13 2017 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/master/RegionStates.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b0780bdc/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
index 6cc8b49..082b5cc 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
@@ -741,7 +741,7 @@ public class RegionStates {
LOG.info("Found region in " + state +
" to be reassigned by ServerCrashProcedure for " + sn);
rits.add(hri);
- } else if(state.isSplittingNew()) {
+ } else if(state.isSplittingNew() || state.isMergingNew()) {
regionsToCleanIfNoMetaEntry.add(state.getRegion());
} else {
LOG.warn("THIS SHOULD NOT HAPPEN: unexpected " + state);