Index: src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java (revision 1005244) +++ src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java (working copy) @@ -152,7 +152,7 @@ GenericArray families = new GenericData.Array(1, familyArraySchema); families.add(familyA); tableA.families = families; - impl.createTable(tableA); + impl.createTable(tableA); assertEquals(impl.describeTable(tableAname).families.size(), 1); impl.disableTable(tableAname); Index: src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java (revision 1005244) +++ src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java (working copy) @@ -29,7 +29,10 @@ import org.apache.hadoop.hbase.catalog.MetaEditor; import org.apache.hadoop.hbase.master.AssignmentManager; import org.apache.hadoop.hbase.master.MasterServices; +import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; +import org.apache.hadoop.hbase.zookeeper.ZKTableDisable; +import org.apache.zookeeper.KeeperException; public class DeleteTableHandler extends TableEventHandler { private static final Log LOG = LogFactory.getLog(DeleteTableHandler.class); @@ -67,5 +70,9 @@ } // Delete table from FS this.masterServices.getMasterFileSystem().deleteTable(tableName); + + // If entry for this table in zk, and up in AssignmentManager, remove it. + // Call to undisableTable does this. TODO: Make a more formal purge table. + am.undisableTable(Bytes.toString(tableName)); } } \ No newline at end of file