Fix regionDir in clone snapshots wfw to clone all mob files rightly to mobdir

Author: Prathyusha Garre

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileTrackerFactory.java

@@ -22,8 +22,10 @@
 import java.util.Map;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
+import org.apache.hadoop.hbase.client.RegionInfo;
 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;
@@ -118,7 +120,23 @@ public static Class<? extends StoreFileTracker> getTrackerClass(String trackerNa
 
   public static StoreFileTracker create(Configuration conf, boolean isPrimaryReplica,
     StoreContext ctx) {
+    RegionInfo mobRegion = MobUtils.getMobRegionInfo(ctx.getTableName());
+    Class<? extends StoreFileTracker> tracker;
+    if (ctx.getRegionInfo().getEncodedName().equals(mobRegion.getEncodedName())) {
+      tracker = Trackers.DEFAULT.clazz;
+    } else {
+      tracker = getTrackerClass(conf);
+    }
+    return createSFTInstance(conf, isPrimaryReplica, ctx, tracker);
+  }
+
+  private static StoreFileTracker create(Configuration conf, boolean isPrimaryReplica) {
     Class<? extends StoreFileTracker> tracker = getTrackerClass(conf);
+    return createSFTInstance(conf, isPrimaryReplica, null, tracker);
+  }
+
+  private static StoreFileTracker createSFTInstance(Configuration conf, boolean isPrimaryReplica,
+    StoreContext ctx, Class<? extends StoreFileTracker> tracker) {
     LOG.debug("instantiating StoreFileTracker impl {}", tracker.getName());
     return ReflectionUtils.newInstance(tracker, conf, isPrimaryReplica, ctx);
   }
@@ -186,7 +204,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);
       TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(descriptor);
       return tracker.updateWithTrackerConfigs(builder).build();
     }

hbase-server/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotHelper.java

@@ -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);