Index: hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTable.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTable.java (revision 1535603) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKTable.java (working copy) @@ -147,7 +147,7 @@ public boolean checkAndSetEnablingTable(final TableName tableName) throws KeeperException { synchronized (this.cache) { - if (isEnablingTable(tableName)) { + if (isEnablingOrEnabledTable(tableName)) { return false; } setTableState(tableName, ZooKeeperProtos.Table.State.ENABLING); @@ -228,6 +228,12 @@ } } + public boolean isEnablingOrEnabledTable(final TableName tableName) { + synchronized (this.cache) { + return isEnablingTable(tableName) || isEnabledTable(tableName); + } + } + public boolean isEnabledOrDisablingTable(final TableName tableName) { synchronized (this.cache) { return isEnabledTable(tableName) || isDisablingTable(tableName);