diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java index bff85cb..da73ead 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java @@ -214,8 +214,9 @@ public class CatalogJanitor extends ScheduledChore { + " from fs because merged region no longer holds references"); HFileArchiver.archiveRegion(this.services.getConfiguration(), fs, regionA); HFileArchiver.archiveRegion(this.services.getConfiguration(), fs, regionB); - MetaTableAccessor.deleteMergeQualifiers(server.getConnection(), - mergedRegion); + MetaTableAccessor.deleteMergeQualifiers(server.getConnection(), mergedRegion); + services.getServerManager().removeRegion(regionA); + services.getServerManager().removeRegion(regionB); return true; } return false; @@ -360,6 +361,7 @@ public class CatalogJanitor extends ScheduledChore { if (LOG.isTraceEnabled()) LOG.trace("Archiving parent region: " + parent); HFileArchiver.archiveRegion(this.services.getConfiguration(), fs, parent); MetaTableAccessor.deleteRegion(this.connection, parent); + services.getServerManager().removeRegion(parent); result = true; } return result; @@ -414,7 +416,7 @@ public class CatalogJanitor extends ScheduledChore { try { regionFs = HRegionFileSystem.openRegionFromFileSystem( this.services.getConfiguration(), fs, tabledir, daughter, true); - + for (HColumnDescriptor family: parentDescriptor.getFamilies()) { if ((references = regionFs.hasReferences(family.getNameAsString()))) { break; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java index f97dfb4..3d8715a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java @@ -1184,4 +1184,22 @@ public class ServerManager { deadservers.cleanAllPreviousInstances(serverName); } } + + /** + * Called by delete table and similar to notify the ServerManager that a region was removed. + */ + public void removeRegion(final HRegionInfo regionInfo) { + final byte[] encodedName = regionInfo.getEncodedNameAsBytes(); + storeFlushedSequenceIdsByRegion.remove(encodedName); + flushedSequenceIdByRegion.remove(encodedName); + } + + /** + * Called by delete table and similar to notify the ServerManager that a region was removed. + */ + public void removeRegions(final List regions) { + for (HRegionInfo hri: regions) { + removeRegion(hri); + } + } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java index f8dd0b6..fdf0b82 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java @@ -363,6 +363,9 @@ public class DeleteTableProcedure // Clean any remaining rows for this table. cleanAnyRemainingRows(env, tableName); + + // clean region references from the server manager + env.getMasterServices().getServerManager().removeRegions(regions); } protected static void deleteAssignmentState(final MasterProcedureEnv env, diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/TruncateTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/TruncateTableProcedure.java index 701eaf7..42eab96 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/TruncateTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/TruncateTableProcedure.java @@ -107,6 +107,8 @@ public class TruncateTableProcedure if (!preserveSplits) { // if we are not preserving splits, generate a new single region regions = Arrays.asList(ModifyRegionUtils.createHRegionInfos(hTableDescriptor, null)); + } else { + regions = recreteRegionInfo(regions); } setNextState(TruncateTableState.TRUNCATE_TABLE_CREATE_FS_LAYOUT); break; @@ -256,6 +258,14 @@ public class TruncateTableProcedure } } + private static List recreteRegionInfo(final List regions) { + ArrayList newRegions = new ArrayList(regions.size()); + for (HRegionInfo hri: regions) { + newRegions.add(new HRegionInfo(hri.getTable(), hri.getStartKey(), hri.getEndKey())); + } + return newRegions; + } + private boolean prepareTruncate(final MasterProcedureEnv env) throws IOException { try { env.getMasterServices().checkTableModifiable(getTableName()); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java index a7bfe18..c72e3f3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java @@ -165,10 +165,10 @@ public class TestTruncateTableProcedure { UTIL.waitUntilAllRegionsAssigned(tableName); // validate the table regions and layout + regions = UTIL.getHBaseAdmin().getTableRegions(tableName).toArray(new HRegionInfo[0]); if (preserveSplits) { - assertEquals(1 + splitKeys.length, UTIL.getHBaseAdmin().getTableRegions(tableName).size()); + assertEquals(1 + splitKeys.length, regions.length); } else { - regions = UTIL.getHBaseAdmin().getTableRegions(tableName).toArray(new HRegionInfo[1]); assertEquals(1, regions.length); } MasterProcedureTestingUtility.validateTableCreation( @@ -231,10 +231,10 @@ public class TestTruncateTableProcedure { UTIL.waitUntilAllRegionsAssigned(tableName); // validate the table regions and layout + regions = UTIL.getHBaseAdmin().getTableRegions(tableName).toArray(new HRegionInfo[0]); if (preserveSplits) { - assertEquals(1 + splitKeys.length, UTIL.getHBaseAdmin().getTableRegions(tableName).size()); + assertEquals(1 + splitKeys.length, regions.length); } else { - regions = UTIL.getHBaseAdmin().getTableRegions(tableName).toArray(new HRegionInfo[1]); assertEquals(1, regions.length); } MasterProcedureTestingUtility.validateTableCreation(