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

HBASE-26615 Snapshot referenced data files are deleted when delete a table with merge regions (#3976) 

Signed-off-by: GeorryHuang <huangzhuoyue@apache.org>
This commit is contained in:
meiyi 2021-12-23 18:51:28 +08:00 committed by Andrew Purtell
parent 51d38b5e4f
commit afabefb051
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.java
View File

@ -56,6 +56,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.DeleteTableState;
import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;
@InterfaceAudience.Private
public class DeleteTableProcedure
@ -317,9 +318,18 @@ public class DeleteTableProcedure
// Archive regions from FS (temp directory)
if (archive) {
List<Path> regionDirList = regions.stream().filter(RegionReplicaUtil::isDefaultReplica)
.map(region -> FSUtils.getRegionDirFromTableDir(tempTableDir, region))
.collect(Collectors.toList());
List<Path> regionDirList = new ArrayList<>();
for (RegionInfo region : regions) {
if (RegionReplicaUtil.isDefaultReplica(region)) {
regionDirList.add(FSUtils.getRegionDirFromTableDir(tempTableDir, region));
List<RegionInfo> mergeRegions = MetaTableAccessor
.getMergeRegions(env.getMasterServices().getConnection(), region.getRegionName());
if (!CollectionUtils.isEmpty(mergeRegions)) {
mergeRegions.stream()
.forEach(r -> regionDirList.add(FSUtils.getRegionDirFromTableDir(tempTableDir, r)));
}
}
}
HFileArchiver.archiveRegions(env.getMasterConfiguration(), fs, mfs.getRootDir(), tempTableDir,
regionDirList);
if (!regionDirList.isEmpty()) {

42
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTableSnapshotScanner.java
View File

@ -470,6 +470,48 @@ public class TestTableSnapshotScanner {
}
}
@Test
public void testDeleteTableWithMergedRegions() throws Exception {
setupCluster();
final TableName tableName = TableName.valueOf(this.name.getMethodName());
String snapshotName = tableName.getNameAsString() + "_snapshot";
Configuration conf = UTIL.getConfiguration();
try (Admin admin = UTIL.getConnection().getAdmin()) {
// disable compaction
admin.compactionSwitch(false,
admin.getRegionServers().stream().map(s -> s.getServerName()).collect(Collectors.toList()));
// create table
Table table = UTIL.createTable(tableName, FAMILIES, 1, bbb, yyy, 3);
List<RegionInfo> regions = admin.getRegions(tableName);
Assert.assertEquals(3, regions.size());
// write some data
UTIL.loadTable(table, FAMILIES);
// merge region
admin.mergeRegionsAsync(new byte[][] { regions.get(0).getEncodedNameAsBytes(),
regions.get(1).getEncodedNameAsBytes() },
false).get();
regions = admin.getRegions(tableName);
Assert.assertEquals(2, regions.size());
// snapshot
admin.snapshot(snapshotName, tableName);
// verify snapshot
try (TableSnapshotScanner scanner =
new TableSnapshotScanner(conf, UTIL.getDataTestDirOnTestFS(snapshotName), snapshotName,
new Scan().withStartRow(bbb).withStopRow(yyy))) {
verifyScanner(scanner, bbb, yyy);
}
// drop table
admin.disableTable(tableName);
admin.deleteTable(tableName);
// verify snapshot
try (TableSnapshotScanner scanner =
new TableSnapshotScanner(conf, UTIL.getDataTestDirOnTestFS(snapshotName), snapshotName,
new Scan().withStartRow(bbb).withStopRow(yyy))) {
verifyScanner(scanner, bbb, yyy);
}
}
}
private void traverseAndSetFileTime(Path path, long time) throws IOException {
fs.setTimes(path, time, -1);
if (fs.isDirectory(path)) {