svn commit: r1536504 - /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java

[jx...@apache.org]

Author: jxiang
Date: Mon Oct 28 20:25:44 2013
New Revision: 1536504

URL: http://svn.apache.org/r1536504
Log:
HBASE-9851 TestHBaseFsck.testQuarantineMissingHFile is flaky

Modified:
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java?rev=1536504&r1=1536503&r2=1536504&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java Mon Oct 28 20:25:44 2013
@@ -371,7 +371,9 @@ public class TestHBaseFsck {
   void deleteTable(TableName tablename) throws IOException {
     HBaseAdmin admin = new HBaseAdmin(conf);
     admin.getConnection().clearRegionCache();
-    admin.disableTableAsync(tablename);
+    if (admin.isTableEnabled(tablename)) {
+      admin.disableTableAsync(tablename);
+    }
     long totalWait = 0;
     long maxWait = 30*1000;
     long sleepTime = 250;
@@ -1672,7 +1674,7 @@ public class TestHBaseFsck {
   /**
    * This creates a table and then corrupts an hfile.  Hbck should quarantine the file.
    */
-  @Test(timeout=120000)
+  @Test(timeout=180000)
   public void testQuarantineCorruptHFile() throws Exception {
     TableName table = TableName.valueOf(name.getMethodName());
     try {
@@ -1754,7 +1756,7 @@ public class TestHBaseFsck {
    * This creates a table and simulates the race situation where a concurrent compaction or split
    * has removed an hfile after the corruption checker learned about it.
    */
-  @Test(timeout=120000)
+  @Test(timeout=180000)
   public void testQuarantineMissingHFile() throws Exception {
     TableName table = TableName.valueOf(name.getMethodName());
     ExecutorService exec = new ScheduledThreadPoolExecutor(10);
@@ -1785,7 +1787,7 @@ public class TestHBaseFsck {
    */
   // Disabled because fails sporadically.  Is this test right?  Timing-wise, there could be no
   // files in a column family on initial creation -- as suggested by Matteo.
-  @Ignore @Test(timeout=120000)
+  @Ignore @Test(timeout=180000)
   public void testQuarantineMissingFamdir() throws Exception {
     TableName table = TableName.valueOf(name.getMethodName());
     ExecutorService exec = new ScheduledThreadPoolExecutor(10);
@@ -1814,7 +1816,7 @@ public class TestHBaseFsck {
    * This creates a table and simulates the race situation where a concurrent compaction or split
    * has removed a region dir before the corruption checker got to it.
    */
-  @Test(timeout=120000)
+  @Test(timeout=180000)
   public void testQuarantineMissingRegionDir() throws Exception {
     TableName table = TableName.valueOf(name.getMethodName());
     ExecutorService exec = new ScheduledThreadPoolExecutor(10);