### Eclipse Workspace Patch 1.0 #P apache-hbase-trunk Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java (revision 1374131) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java (working copy) @@ -62,7 +62,11 @@ for (HRegionInfo region : regions) { long done = System.currentTimeMillis() + waitTime; while (System.currentTimeMillis() < done) { - if (!am.getRegionStates().isRegionInTransition(region)) break; + // Make sure region is offline, see HBASE-6473 + if (!am.getRegionStates().isRegionInTransition(region) + && !am.getRegionStates().getRegionsOfTable(tableName) + .contains(region)) + break; Threads.sleep(waitingTimeForEvents); LOG.debug("Waiting on region to clear regions in transition; " + am.getRegionStates().getRegionTransitionState(region));