Index: src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTable.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTable.java (revision 1534377) +++ src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTable.java (working copy) @@ -170,7 +170,7 @@ public boolean checkAndSetEnablingTable(final String tableName) throws KeeperException { synchronized (this.cache) { - if (isEnablingTable(tableName)) { + if (isEnablingOrEnabledTable(tableName)) { return false; } setTableState(tableName, TableState.ENABLING); @@ -291,6 +291,12 @@ } } + public boolean isEnablingOrEnabledTable(final String tableName) { + synchronized (this.cache) { + return isEnablingTable(tableName) || isEnabledTable(tableName); + } + } + public boolean isEnabledOrDisablingTable(final String tableName) { synchronized (this.cache) { return isEnabledTable(tableName) || isDisablingTable(tableName);