svn commit: r1005552 - in /hbase/trunk/src: main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java

[stack]

Author: stack
Date: Thu Oct  7 18:13:04 2010
New Revision: 1005552

URL: http://svn.apache.org/viewvc?rev=1005552&view=rev
Log:
HBASE-3088 TestAvroServer and TestThriftServer broken because use same table in 
all tests and tests enable/disable/delete

Modified:
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java?rev=1005552&r1=1005551&r2=1005552&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
 Thu Oct  7 18:13:04 2010
@@ -29,7 +29,10 @@ import org.apache.hadoop.hbase.Server;
 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 @@ public class DeleteTableHandler extends 
     }
     // 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

Modified: 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java?rev=1005552&r1=1005551&r2=1005552&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java 
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java 
Thu Oct  7 18:13:04 2010
@@ -152,7 +152,7 @@ public class TestAvroServer {
     GenericArray<AFamilyDescriptor> families = new 
GenericData.Array<AFamilyDescriptor>(1, familyArraySchema);
     families.add(familyA);
     tableA.families = families;
-    impl.createTable(tableA);    
+    impl.createTable(tableA);
     assertEquals(impl.describeTable(tableAname).families.size(), 1);
 
     impl.disableTable(tableAname);