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

HBASE-13114 [UNITTEST] TestEnableTableHandler.testDeleteForSureClearsAllTableRowsFromMeta 

Conflicts:
	hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestEnableTableHandler.java
This commit is contained in:
stack 2015-03-10 14:15:33 -07:00
parent ed93ddd94f
commit 09e9c92d76
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
View File

@ -158,6 +158,9 @@ public class DeleteTableHandler extends TableEventHandler {
if (!deletes.isEmpty()) { if (!deletes.isEmpty()) {
LOG.warn("Deleting some vestigal " + deletes.size() + " rows of " + this.tableName + LOG.warn("Deleting some vestigal " + deletes.size() + " rows of " + this.tableName +
" from " + TableName.META_TABLE_NAME); " from " + TableName.META_TABLE_NAME);
if (LOG.isDebugEnabled()) {
for (Delete d: deletes) LOG.debug("Purging " + d);
}
metaTable.delete(deletes); metaTable.delete(deletes);
} }
} }

12
hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestEnableTableHandler.java
View File

@ -137,22 +137,20 @@ public class TestEnableTableHandler {
public void testDeleteForSureClearsAllTableRowsFromMeta() public void testDeleteForSureClearsAllTableRowsFromMeta()
throws IOException, InterruptedException { throws IOException, InterruptedException {
final TableName tableName = TableName.valueOf("testDeleteForSureClearsAllTableRowsFromMeta"); final TableName tableName = TableName.valueOf("testDeleteForSureClearsAllTableRowsFromMeta");
final MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
final HMaster m = cluster.getMaster();
final HBaseAdmin admin = TEST_UTIL.getHBaseAdmin(); final HBaseAdmin admin = TEST_UTIL.getHBaseAdmin();
final HTableDescriptor desc = new HTableDescriptor(tableName); final HTableDescriptor desc = new HTableDescriptor(tableName);
desc.addFamily(new HColumnDescriptor(FAMILYNAME)); desc.addFamily(new HColumnDescriptor(FAMILYNAME));
admin.createTable(desc, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE); admin.createTable(desc, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);
// Now I have a nice table, mangle it by removing the HConstants.REGIONINFO_QUALIFIER_STR // Now I have a nice table, mangle it by removing the HConstants.REGIONINFO_QUALIFIER_STR
// content from a few of the rows. // content from a few of the rows.
Scan metaScannerForMyTable =
MetaTableAccessor.getScanForTableName(TEST_UTIL.getConnection(), tableName);
try (Table metaTable = TEST_UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) { try (Table metaTable = TEST_UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {
try (ResultScanner scanner = metaTable.getScanner(metaScannerForMyTable)) { try (ResultScanner scanner =
metaTable.getScanner(MetaTableAccessor.getScanForTableName(TEST_UTIL.getConnection(), tableName))) {
for (Result result : scanner) { for (Result result : scanner) {
// Just delete one row. // Just delete one row.
Delete d = new Delete(result.getRow()); Delete d = new Delete(result.getRow());
d.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER); d.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);
LOG.info("Mangled: " + d);
metaTable.delete(d); metaTable.delete(d);
break; break;
} }
@ -162,8 +160,10 @@ public class TestEnableTableHandler {
// Presume this synchronous all is. // Presume this synchronous all is.
admin.deleteTable(tableName); admin.deleteTable(tableName);
int rowCount = 0; int rowCount = 0;
try (ResultScanner scanner = metaTable.getScanner(metaScannerForMyTable)) { try (ResultScanner scanner =
metaTable.getScanner(MetaTableAccessor.getScanForTableName(TEST_UTIL.getConnection(), tableName))) {
for (Result result : scanner) { for (Result result : scanner) {
LOG.info("Found when none expected: " + result);
rowCount++; rowCount++;
} }
} }