HBASE-29346 Use rootDir, tableDir instance vars of RestoreSnapshotHelper while removeHDFSRegions of restore

Author: Prathyusha Garre

hbase-server/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiver.java

@@ -105,6 +105,20 @@ public static void archiveRegion(Configuration conf, FileSystem fs, RegionInfo i
       FSUtils.getRegionDirFromRootDir(rootDir, info));
   }
 
+  /**
+   * Cleans up all the files for a HRegion by archiving the HFiles to the archive directory
+   * @param conf     the configuration to use
+   * @param fs       the file system object
+   * @param info     RegionInfo for region to be deleted
+   * @param rootdir  {@link Path} to the root directory where hbase files are stored (for building
+   *                 the archive path)
+   * @param tableDir {@link Path} to where the table is being stored (for building the archive path)
+   */
+  public static void archiveRegion(Configuration conf, FileSystem fs, RegionInfo info, Path rootDir,
+    Path tableDir) throws IOException {
+    archiveRegion(conf, fs, rootDir, tableDir, FSUtils.getRegionDirFromRootDir(rootDir, info));
+  }
+
   /**
    * Remove an entire region from the table directory via archiving the region's hfiles.
    * @param fs        {@link FileSystem} from which to remove the region

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

@@ -413,7 +413,7 @@ private void removeHdfsRegions(final ThreadPoolExecutor exec, final List<RegionI
     ModifyRegionUtils.editRegions(exec, regions, new ModifyRegionUtils.RegionEditTask() {
       @Override
       public void editRegion(final RegionInfo hri) throws IOException {
-        HFileArchiver.archiveRegion(conf, fs, hri);
+        HFileArchiver.archiveRegion(conf, fs, hri, rootDir, tableDir);
       }
     });
   }