svn commit: r1455234 - in /hbase/trunk/hbase-server/src: main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java

[mb...@apache.org]

Author: mbertozzi
Date: Mon Mar 11 17:01:32 2013
New Revision: 1455234

URL: http://svn.apache.org/r1455234
Log:
HBASE-8067 TestHFileArchiving.testArchiveOnTableDelete sometimes fails -- more debug

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java?rev=1455234&r1=1455233&r2=1455234&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java Mon Mar 11 17:01:32 2013
@@ -104,11 +104,15 @@ public class DeleteTableHandler extends 
       if (!fs.delete(tempTableDir, true)) {
         LOG.error("Couldn't delete " + tempTableDir);
       }
+
+      LOG.debug("Table '" + tableName + "' archived!");
     } finally {
       // 6. Update table descriptor cache
+      LOG.debug("Removing '" + tableName + "' descriptor.");
       this.masterServices.getTableDescriptors().remove(Bytes.toString(tableName));
 
       // 7. If entry for this table in zk, and up in AssignmentManager, remove it.
+      LOG.debug("Marking '" + tableName + "' as deleted.");
       am.getZKTable().setDeletedTable(Bytes.toString(tableName));
     }
 

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java?rev=1455234&r1=1455233&r2=1455234&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java Mon Mar 11 17:01:32 2013
@@ -243,6 +243,7 @@ public class TestHFileArchiving {
 
     // then delete the table so the hfiles get archived
     UTIL.deleteTable(TABLE_NAME);
+    LOG.debug("Deleted table");
 
     // then get the files in the archive directory.
     Path archiveDir = HFileArchiveUtil.getArchivePath(UTIL.getConfiguration());