You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jm...@apache.org on 2012/10/01 19:33:32 UTC
svn commit: r1392456 -
/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
Author: jmhsieh
Date: Mon Oct 1 17:33:31 2012
New Revision: 1392456
URL: http://svn.apache.org/viewvc?rev=1392456&view=rev
Log:
HBASE-6906 TestHBaseFsck#testQuarantine* tests are flakey due to TestNotEnabledException
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=1392456&r1=1392455&r2=1392456&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 1 17:33:31 2012
@@ -1379,6 +1379,9 @@ public class TestHBaseFsck {
}
}
+ /**
+ * Test that use this should have a timeout, because this method could potentially wait forever.
+ */
private void doQuarantineTest(String table, HBaseFsck hbck, int check, int corrupt, int fail,
int quar, int missing) throws Exception {
try {
@@ -1401,7 +1404,16 @@ public class TestHBaseFsck {
assertEquals(hfcc.getMissing().size(), missing);
// its been fixed, verify that we can enable
- TEST_UTIL.getHBaseAdmin().enableTable(table);
+ HBaseAdmin admin = TEST_UTIL.getHBaseAdmin();
+ admin.enableTableAsync(table);
+ while (!admin.isTableEnabled(table)) {
+ try {
+ Thread.sleep(250);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ fail("Interrupted when trying to enable table " + table);
+ }
+ }
} finally {
deleteTable(table);
}