diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java index c7a5345..1e5dd1a 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java @@ -391,19 +391,18 @@ public class IntegrationTestLoadAndVerify extends IntegrationTestBase { private void deleteTable(HBaseAdmin admin, HTableDescriptor htd) throws IOException, InterruptedException { // Use disableTestAsync because disable can take a long time to complete - System.out.print("Disabling table " + htd.getTableName() +" "); + System.out.println("Disabling table " + htd.getTableName()); admin.disableTableAsync(htd.getTableName()); long start = System.currentTimeMillis(); // NOTE tables can be both admin.isTableEnabled=false and // isTableDisabled=false, when disabling must use isTableDisabled! while (!admin.isTableDisabled(htd.getTableName())) { - System.out.print("."); Thread.sleep(1000); } long delta = System.currentTimeMillis() - start; - System.out.println(" " + delta +" ms"); - System.out.println("Deleting table " + htd.getTableName() +" "); + System.out.println("Disabling took " + delta +" ms"); + System.out.println("Deleting table " + htd.getTableName()); admin.deleteTable(htd.getTableName()); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java index 9ea1f08..9c22e60 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java @@ -37,6 +37,7 @@ import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableExistsException; import org.apache.hadoop.hbase.TableNotDisabledException; +import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.catalog.MetaReader; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.executor.EventHandler; @@ -229,7 +230,7 @@ public abstract class TableEventHandler extends EventHandler { HTableDescriptor htd = this.masterServices.getTableDescriptors().get(tableName); if (htd == null) { - throw new IOException("HTableDescriptor missing for " + tableName); + throw new TableNotFoundException("HTableDescriptor missing for " + tableName); } return htd; }