From c4b4023b60dd51a7e0ad83883afec569037e5329 Mon Sep 17 00:00:00 2001 From: Umesh Agashe Date: Tue, 1 May 2018 14:56:24 -0700 Subject: [PATCH] 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. --- .../hadoop/hbase/master/assignment/AssignmentManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 6f18d68f51b..1d95041a049 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);