You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bh...@apache.org on 2020/07/29 17:59:46 UTC
[hbase] branch master updated: HBASE-20226: Parallelize region
manifest deletes (#2159)
This is an automated email from the ASF dual-hosted git repository.
bharathv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new f07f30a HBASE-20226: Parallelize region manifest deletes (#2159)
f07f30a is described below
commit f07f30ae24e6d0e9151bb76aebf78928ec9572e3
Author: Bharath Vissapragada <bh...@apache.org>
AuthorDate: Wed Jul 29 10:59:23 2020 -0700
HBASE-20226: Parallelize region manifest deletes (#2159)
We observed this delete call to be a bottleneck for table with lots of
regions. Patch attempts to parallelize them.
Signed-off-by: Andrew Purtell <ap...@apache.org>
---
.../hadoop/hbase/snapshot/SnapshotManifest.java | 88 ++++++++++++++--------
1 file changed, 56 insertions(+), 32 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifest.java
index 855e98c..1bda570 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifest.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotManifest.java
@@ -20,11 +20,15 @@ package org.apache.hadoop.hbase.snapshot;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InterruptedIOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.conf.Configuration;
@@ -513,43 +517,63 @@ public final class SnapshotManifest {
workingDir, desc);
v2Regions = SnapshotManifestV2.loadRegionManifests(conf, tpool, workingDirFs,
workingDir, desc, manifestSizeLimit);
- } finally {
- tpool.shutdown();
- }
- SnapshotDataManifest.Builder dataManifestBuilder = SnapshotDataManifest.newBuilder();
- dataManifestBuilder.setTableSchema(ProtobufUtil.toTableSchema(htd));
+ SnapshotDataManifest.Builder dataManifestBuilder = SnapshotDataManifest.newBuilder();
+ dataManifestBuilder.setTableSchema(ProtobufUtil.toTableSchema(htd));
- if (v1Regions != null && v1Regions.size() > 0) {
- dataManifestBuilder.addAllRegionManifests(v1Regions);
- }
- if (v2Regions != null && v2Regions.size() > 0) {
- dataManifestBuilder.addAllRegionManifests(v2Regions);
- }
+ if (v1Regions != null && v1Regions.size() > 0) {
+ dataManifestBuilder.addAllRegionManifests(v1Regions);
+ }
+ if (v2Regions != null && v2Regions.size() > 0) {
+ dataManifestBuilder.addAllRegionManifests(v2Regions);
+ }
- // Write the v2 Data Manifest.
- // Once the data-manifest is written, the snapshot can be considered complete.
- // Currently snapshots are written in a "temporary" directory and later
- // moved to the "complated" snapshot directory.
- setStatusMsg("Writing data manifest for " + this.desc.getName());
- SnapshotDataManifest dataManifest = dataManifestBuilder.build();
- writeDataManifest(dataManifest);
- this.regionManifests = dataManifest.getRegionManifestsList();
-
- // Remove the region manifests. Everything is now in the data-manifest.
- // The delete operation is "relaxed", unless we get an exception we keep going.
- // The extra files in the snapshot directory will not give any problem,
- // since they have the same content as the data manifest, and even by re-reading
- // them we will get the same information.
- if (v1Regions != null && v1Regions.size() > 0) {
- for (SnapshotRegionManifest regionManifest: v1Regions) {
- SnapshotManifestV1.deleteRegionManifest(workingDirFs, workingDir, regionManifest);
+ // Write the v2 Data Manifest.
+ // Once the data-manifest is written, the snapshot can be considered complete.
+ // Currently snapshots are written in a "temporary" directory and later
+ // moved to the "complated" snapshot directory.
+ setStatusMsg("Writing data manifest for " + this.desc.getName());
+ SnapshotDataManifest dataManifest = dataManifestBuilder.build();
+ writeDataManifest(dataManifest);
+ this.regionManifests = dataManifest.getRegionManifestsList();
+
+ // Remove the region manifests. Everything is now in the data-manifest.
+ // The delete operation is "relaxed", unless we get an exception we keep going.
+ // The extra files in the snapshot directory will not give any problem,
+ // since they have the same content as the data manifest, and even by re-reading
+ // them we will get the same information.
+ int totalDeletes = 0;
+ ExecutorCompletionService<Void> completionService = new ExecutorCompletionService<>(tpool);
+ if (v1Regions != null) {
+ for (SnapshotRegionManifest regionManifest: v1Regions) {
+ ++totalDeletes;
+ completionService.submit(() -> {
+ SnapshotManifestV1.deleteRegionManifest(workingDirFs, workingDir, regionManifest);
+ return null;
+ });
+ }
}
- }
- if (v2Regions != null && v2Regions.size() > 0) {
- for (SnapshotRegionManifest regionManifest: v2Regions) {
- SnapshotManifestV2.deleteRegionManifest(workingDirFs, workingDir, regionManifest);
+ if (v2Regions != null) {
+ for (SnapshotRegionManifest regionManifest: v2Regions) {
+ ++totalDeletes;
+ completionService.submit(() -> {
+ SnapshotManifestV2.deleteRegionManifest(workingDirFs, workingDir, regionManifest);
+ return null;
+ });
+ }
}
+ // Wait for the deletes to finish.
+ for (int i = 0; i < totalDeletes; i++) {
+ try {
+ completionService.take().get();
+ } catch (InterruptedException ie) {
+ throw new InterruptedIOException(ie.getMessage());
+ } catch (ExecutionException e) {
+ throw new IOException("Error deleting region manifests", e.getCause());
+ }
+ }
+ } finally {
+ tpool.shutdown();
}
}