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 2018/05/03 13:28:15 UTC
[02/28] hbase git commit: HBASE-20514 On Master restart if table is
stuck in DISABLING state,
CLOSED regions should not be considered stuck in-transition
HBASE-20514 On Master restart if table is stuck in DISABLING state, CLOSED regions should not be considered stuck in-transition
On startup CLOSED regions of DISABLED and DISABLING tables are treated the same way as not in-transition.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c4b4023b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c4b4023b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c4b4023b
Branch: refs/heads/HBASE-19064
Commit: c4b4023b60dd51a7e0ad83883afec569037e5329
Parents: 2e9b96e
Author: Umesh Agashe <ua...@cloudera.com>
Authored: Tue May 1 14:56:24 2018 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Wed May 2 12:18:24 2018 -0700
----------------------------------------------------------------------
.../hadoop/hbase/master/assignment/AssignmentManager.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c4b4023b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
----------------------------------------------------------------------
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 6f18d68..1d95041 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
@@ -1257,9 +1257,10 @@ public class AssignmentManager implements ServerListener {
} else if (localState == State.OFFLINE || regionInfo.isOffline()) {
regionStates.addToOfflineRegions(regionNode);
} else if (localState == State.CLOSED && getTableStateManager().
- isTableState(regionNode.getTable(), TableState.State.DISABLED)) {
- // The region is CLOSED and the table is DISABLED, there is nothing to schedule;
- // the region is inert.
+ isTableState(regionNode.getTable(), TableState.State.DISABLED,
+ TableState.State.DISABLING)) {
+ // The region is CLOSED and the table is DISABLED/ DISABLING, there is nothing to
+ // schedule; the region is inert.
} else {
// These regions should have a procedure in replay
regionStates.addRegionInTransition(regionNode, null);