Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-13179 TestMasterObserver deleteTable is flaky

This commit is contained in:
Matteo Bertozzi 2015-03-09 19:47:27 +00:00
parent f7c35f8b53
commit 5197640c30
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
View File

@ -75,6 +75,7 @@ public class TestMasterObserver {
private static final Log LOG = LogFactory.getLog(TestMasterObserver.class); private static final Log LOG = LogFactory.getLog(TestMasterObserver.class);
public static CountDownLatch tableCreationLatch = new CountDownLatch(1); public static CountDownLatch tableCreationLatch = new CountDownLatch(1);
public static CountDownLatch tableDeletionLatch = new CountDownLatch(1);
public static class CPMasterObserver implements MasterObserver { public static class CPMasterObserver implements MasterObserver {
@ -854,6 +855,7 @@ public class TestMasterObserver {
ObserverContext<MasterCoprocessorEnvironment> ctx, TableName tableName) ObserverContext<MasterCoprocessorEnvironment> ctx, TableName tableName)
throws IOException { throws IOException {
postDeleteTableHandlerCalled = true; postDeleteTableHandlerCalled = true;
tableDeletionLatch.countDown();
} }
public boolean wasDeleteTableHandlerCalled() { public boolean wasDeleteTableHandlerCalled() {
@ -1212,7 +1214,7 @@ public class TestMasterObserver {
// delete table // delete table
admin.disableTable(tableName); admin.disableTable(tableName);
assertTrue(admin.isTableDisabled(tableName)); assertTrue(admin.isTableDisabled(tableName));
admin.deleteTable(tableName); deleteTable(admin, tableName);
assertFalse("Test table should have been deleted", assertFalse("Test table should have been deleted",
admin.tableExists(tableName)); admin.tableExists(tableName));
// preDeleteTable can't bypass default action. // preDeleteTable can't bypass default action.
@ -1295,7 +1297,7 @@ public class TestMasterObserver {
assertFalse("No table deleted yet", cp.wasDeleteTableCalled()); assertFalse("No table deleted yet", cp.wasDeleteTableCalled());
assertFalse("Delete table handler should not be called.", assertFalse("Delete table handler should not be called.",
cp.wasDeleteTableHandlerCalled()); cp.wasDeleteTableHandlerCalled());
admin.deleteTable(tableName); deleteTable(admin, tableName);
assertFalse("Test table should have been deleted", assertFalse("Test table should have been deleted",
admin.tableExists(tableName)); admin.tableExists(tableName));
assertTrue("Coprocessor should have been called on table delete", assertTrue("Coprocessor should have been called on table delete",
@ -1343,7 +1345,7 @@ public class TestMasterObserver {
cp.wasRestoreSnapshotCalled()); cp.wasRestoreSnapshotCalled());
admin.disableTable(TEST_CLONE); admin.disableTable(TEST_CLONE);
assertTrue(admin.isTableDisabled(tableName)); assertTrue(admin.isTableDisabled(tableName));
admin.deleteTable(TEST_CLONE); deleteTable(admin, TEST_CLONE);
// Test restore operation // Test restore operation
cp.resetStates(); cp.resetStates();
@ -1357,7 +1359,7 @@ public class TestMasterObserver {
assertTrue("Coprocessor should have been called on snapshot delete", assertTrue("Coprocessor should have been called on snapshot delete",
cp.wasDeleteSnapshotCalled()); cp.wasDeleteSnapshotCalled());
} finally { } finally {
admin.deleteTable(tableName); deleteTable(admin, tableName);
} }
} }
@ -1537,7 +1539,9 @@ public class TestMasterObserver {
assertTrue("Coprocessor should be called on region rebalancing", assertTrue("Coprocessor should be called on region rebalancing",
cp.wasBalanceCalled()); cp.wasBalanceCalled());
} finally { } finally {
UTIL.deleteTable(tableName); Admin admin = UTIL.getHBaseAdmin();
admin.disableTable(tableName);
deleteTable(admin, tableName);
} }
} }
@ -1584,4 +1588,13 @@ public class TestMasterObserver {
assertTrue("Coprocessor should be called on table names request", assertTrue("Coprocessor should be called on table names request",
cp.wasGetTableNamesCalled()); cp.wasGetTableNamesCalled());
} }
private void deleteTable(Admin admin, TableName tableName) throws Exception {
// NOTE: We need a latch because admin is not sync,
// so the postOp coprocessor method may be called after the admin operation returned.
tableDeletionLatch = new CountDownLatch(1);
admin.deleteTable(tableName);
tableDeletionLatch.await();
tableDeletionLatch = new CountDownLatch(1);
}
} }