Revert "HBASE-28806 ExportSnapshot failed if reference file presented"

This reverts commit 1780ab6.

Author: mokai87

hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java

@@ -28,8 +28,6 @@
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -661,7 +659,6 @@ private static List<Pair<SnapshotFileInfo, Long>> getSnapshotFiles(final Configu
 
     // Get snapshot files
     LOG.info("Loading Snapshot '" + snapshotDesc.getName() + "' hfile list");
-    Set<String> existingFiles = new TreeSet<>();
     SnapshotReferenceUtil.visitReferencedFiles(conf, fs, snapshotDir, snapshotDesc,
       new SnapshotReferenceUtil.SnapshotVisitor() {
         @Override
@@ -681,13 +678,7 @@ public void storeFile(final RegionInfo regionInfo, final String family,
             snapshotFileAndSize = getSnapshotFileAndSize(fs, conf, table, referencedRegion, family,
               referencedHFile, storeFile.hasFileSize() ? storeFile.getFileSize() : -1);
           }
-          String fileToExport = snapshotFileAndSize.getFirst().getHfile();
-          if (!existingFiles.contains(fileToExport)) {
-            files.add(snapshotFileAndSize);
-            existingFiles.add(fileToExport);
-          } else {
-            LOG.debug("Skip the existing file: {}.", fileToExport);
-          }
+          files.add(snapshotFileAndSize);
         }
       });
 

hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java

@@ -106,7 +106,6 @@ public static void setUpBaseConf(Configuration conf) {
     // If a single node has enough failures (default 3), resource manager will blacklist it.
     // With only 2 nodes and tests injecting faults, we don't want that.
     conf.setInt("mapreduce.job.maxtaskfailures.per.tracker", 100);
-    conf.setInt("snapshot.export.default.map.group", 1);
   }
 
   @BeforeClass
@@ -207,48 +206,6 @@ public void testExportFileSystemStateWithMergeRegion() throws Exception {
     TEST_UTIL.deleteTable(tableName0);
   }
 
-  @Test
-  public void testExportFileSystemStateWithSplitRegion() throws Exception {
-    // disable compaction
-    admin.compactionSwitch(false,
-      admin.getRegionServers().stream().map(a -> a.getServerName()).collect(Collectors.toList()));
-    // create Table
-    TableName splitTableName = TableName.valueOf(testName.getMethodName());
-    String splitTableSnap = "snapshot-" + testName.getMethodName();
-    admin.createTable(TableDescriptorBuilder.newBuilder(splitTableName).setColumnFamilies(
-      Lists.newArrayList(ColumnFamilyDescriptorBuilder.newBuilder(FAMILY).build())).build());
-
-    // put some data
-    try (Table table = admin.getConnection().getTable(splitTableName)) {
-      table.put(new Put(Bytes.toBytes("row1")).addColumn(FAMILY, null, Bytes.toBytes("value1")));
-      table.put(new Put(Bytes.toBytes("row2")).addColumn(FAMILY, null, Bytes.toBytes("value2")));
-      table.put(new Put(Bytes.toBytes("row3")).addColumn(FAMILY, null, Bytes.toBytes("value3")));
-      table.put(new Put(Bytes.toBytes("row4")).addColumn(FAMILY, null, Bytes.toBytes("value4")));
-      table.put(new Put(Bytes.toBytes("row5")).addColumn(FAMILY, null, Bytes.toBytes("value5")));
-      table.put(new Put(Bytes.toBytes("row6")).addColumn(FAMILY, null, Bytes.toBytes("value6")));
-      table.put(new Put(Bytes.toBytes("row7")).addColumn(FAMILY, null, Bytes.toBytes("value7")));
-      table.put(new Put(Bytes.toBytes("row8")).addColumn(FAMILY, null, Bytes.toBytes("value8")));
-      // Flush to HFile
-      admin.flush(tableName);
-    }
-
-    List<RegionInfo> regions = admin.getRegions(splitTableName);
-    assertEquals(1, regions.size());
-    tableNumFiles = regions.size();
-
-    // split region
-    admin.split(splitTableName, Bytes.toBytes("row5"));
-    regions = admin.getRegions(splitTableName);
-    assertEquals(2, regions.size());
-
-    // take a snapshot
-    admin.snapshot(splitTableSnap, splitTableName);
-    // export snapshot and verify
-    testExportFileSystemState(splitTableName, splitTableSnap, splitTableSnap, tableNumFiles);
-    // delete table
-    TEST_UTIL.deleteTable(splitTableName);
-  }
-
   @Test
   public void testExportFileSystemStateWithSkipTmp() throws Exception {
     TEST_UTIL.getConfiguration().setBoolean(ExportSnapshot.CONF_SKIP_TMP, true);