You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2013/10/28 21:41:22 UTC

svn commit: r1536510 - /hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java

Author: jxiang
Date: Mon Oct 28 20:41:21 2013
New Revision: 1536510

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

Modified:
    hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java

Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java?rev=1536510&r1=1536509&r2=1536510&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java Mon Oct 28 20:41:21 2013
@@ -356,7 +356,9 @@ public class TestHBaseFsck {
     HBaseAdmin admin = new HBaseAdmin(conf);
     admin.getConnection().clearRegionCache();
     byte[] tbytes = Bytes.toBytes(tablename);
-    admin.disableTableAsync(tbytes);
+    if (admin.isTableEnabled(tbytes)) {
+      admin.disableTableAsync(tbytes);
+    }
     while (!admin.isTableDisabled(tbytes)) {
       try {
         Thread.sleep(250);
@@ -1616,7 +1618,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 {
     String table = name.getMethodName();
     try {
@@ -1697,7 +1699,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 {
     String table = name.getMethodName();
     ExecutorService exec = new ScheduledThreadPoolExecutor(10);
@@ -1724,7 +1726,7 @@ public class TestHBaseFsck {
    * This creates a table and simulates the race situation where a concurrent compaction or split
    * has removed an colfam dir before the corruption checker got to it.
    */
-  @Test(timeout=120000)
+  @Test(timeout=180000)
   public void testQuarantineMissingFamdir() throws Exception {
     String table = name.getMethodName();
     ExecutorService exec = new ScheduledThreadPoolExecutor(10);
@@ -1751,7 +1753,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 {
     String table = name.getMethodName();
     ExecutorService exec = new ScheduledThreadPoolExecutor(10);