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/05/02 19:17:46 UTC
hbase git commit: HBASE-20514 On Master restart if table is stuck in
DISABLING state, CLOSED regions should not be considered stuck in-transition
Repository: hbase
Updated Branches:
refs/heads/branch-2.0 8886c844f -> e8cf29047
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/e8cf2904
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e8cf2904
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e8cf2904
Branch: refs/heads/branch-2.0
Commit: e8cf290476238074f88682ad88dc5bbcc97a5222
Parents: 8886c84
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:00:38 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/e8cf2904/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 70ebb69..e3965d6 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);