### Eclipse Workspace Patch 1.0 #P apache-hbase-trunk Index: hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java (revision 1367410) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java (working copy) @@ -239,7 +239,7 @@ admin.deleteTable(tableName); } admin.createTable(htd); - TEST_UTIL.waitTableAvailable(htd.getName(), 5000); + TEST_UTIL.waitTableEnabled(htd.getName(), 5000); // verify that the coprocessors were loaded boolean found1 = false, found2 = false, found2_k1 = false, @@ -282,7 +282,7 @@ Coprocessor.PRIORITY_USER); HBaseAdmin admin = TEST_UTIL.getHBaseAdmin(); admin.createTable(htd); - TEST_UTIL.waitTableAvailable(htd.getName(), 5000); + TEST_UTIL.waitTableEnabled(htd.getName(), 5000); // verify that the coprocessor was loaded boolean found = false; @@ -345,7 +345,7 @@ admin.deleteTable(tableName); } admin.createTable(htd); - TEST_UTIL.waitTableAvailable(htd.getName(), 5000); + TEST_UTIL.waitTableEnabled(htd.getName(), 5000); // verify that the coprocessor was loaded boolean found_2 = false, found_1 = false, found_3 = false, @@ -450,7 +450,7 @@ admin.deleteTable(tableName); } admin.createTable(htd); - TEST_UTIL.waitTableAvailable(htd.getName(), 5000); + TEST_UTIL.waitTableEnabled(htd.getName(), 5000); // verify that the coprocessors were loaded boolean found1 = false, found2 = false, found2_k1 = false, Index: hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (revision 1367410) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (working copy) @@ -1658,6 +1658,16 @@ } } + public void waitTableEnabled(byte[] table, long timeoutMillis) + throws InterruptedException, IOException { + long startWait = System.currentTimeMillis(); + while (!getHBaseAdmin().isTableEnabled(table)) { + assertTrue("Timed out waiting for table " + Bytes.toStringBinary(table), + System.currentTimeMillis() - startWait < timeoutMillis); + Thread.sleep(200); + } + } + /** * Make sure that at least the specified number of region servers * are running