Skip to content

HBASE-29598 Fix regionDir in clone snapshots wfw to clone all mob files rightly t… #7309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

HBASE-29598 Fix regionDir in clone snapshots wfw to clone all mob files rightly t… #7309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ...n/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileTrackerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.mob.MobUtils;
import org.apache.hadoop.hbase.procedure2.util.StringUtils;
import org.apache.hadoop.hbase.regionserver.HRegionFileSystem;
import org.apache.hadoop.hbase.regionserver.StoreContext;
Expand Down Expand Up @@ -118,7 +119,15 @@ public static Class<? extends StoreFileTracker> getTrackerClass(String trackerNa

public static StoreFileTracker create(Configuration conf, boolean isPrimaryReplica,
StoreContext ctx) {
Class<? extends StoreFileTracker> tracker = getTrackerClass(conf);
Class<? extends StoreFileTracker> tracker;
if (
ctx != null && ctx.getRegionInfo().getEncodedName()
.equals(MobUtils.getMobRegionInfo(ctx.getTableName()).getEncodedName())
) {
tracker = Trackers.DEFAULT.clazz;
} else {
tracker = getTrackerClass(conf);
}
LOG.debug("instantiating StoreFileTracker impl {}", tracker.getName());
return ReflectionUtils.newInstance(tracker, conf, isPrimaryReplica, ctx);
}
Expand Down Expand Up @@ -186,7 +195,7 @@ public static TableDescriptor updateWithTrackerConfigs(Configuration conf,
// descriptors with the SFT impl specific configs. By the time this happens, the table has no
// regions nor stores yet, so it can't create a proper StoreContext.
if (StringUtils.isEmpty(descriptor.getValue(TRACKER_IMPL))) {
StoreFileTracker tracker = StoreFileTrackerFactory.create(conf, true, null);
StoreFileTracker tracker = create(conf, true, null);
TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(descriptor);
return tracker.updateWithTrackerConfigs(builder).build();
}
Expand Down
3 changes: 1 addition & 2 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,8 +661,7 @@ private void cloneRegion(final RegionInfo newRegionInfo, final Path regionDir,
for (SnapshotRegionManifest.FamilyFiles familyFiles : manifest.getFamilyFilesList()) {
Path familyDir = new Path(regionDir, familyFiles.getFamilyName().toStringUtf8());
List<StoreFileInfo> clonedFiles = new ArrayList<>();
Path regionPath = new Path(tableDir, newRegionInfo.getEncodedName());
HRegionFileSystem regionFS = (fs.exists(regionPath))
HRegionFileSystem regionFS = (fs.exists(regionDir))
? HRegionFileSystem.openRegionFromFileSystem(conf, fs, tableDir, newRegionInfo, false)
: HRegionFileSystem.createRegionOnFileSystem(conf, fs, tableDir, newRegionInfo);

Expand Down