HBASE-23816 [Flakey Test] TestExportSnapshotNoCluster.testSnapshotV2WithRefsExportFileSystemState(TestExportSnapshotNoCluster.java:91) Wrong FS! ADDENDUM: Break test in two to see if it makes it more reliable. (#1162)

ADDENDUM that breaks test in two to see if it makes it more reliable.

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

@@ -18,8 +18,9 @@
 package org.apache.hadoop.hbase.snapshot;
 
 import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
 import java.net.URI;
-import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.LocalFileSystem;
 import org.apache.hadoop.fs.Path;
@@ -40,63 +41,62 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Test Export Snapshot Tool
+ * Tests V1 snapshots only. Used to ALSO test v2 but strange failure so separate the tests.
+ * See companion file for test of v2 snapshot.
+ * @see TestExportSnapshotV2NoCluster
  */
 @Category({MapReduceTests.class, MediumTests.class})
-public class TestExportSnapshotNoCluster {
+public class TestExportSnapshotV1NoCluster {
-
   @ClassRule
   public static final HBaseClassTestRule CLASS_RULE =
-      HBaseClassTestRule.forClass(TestExportSnapshotNoCluster.class);
+      HBaseClassTestRule.forClass(TestExportSnapshotV1NoCluster.class);
+  private static final Logger LOG = LoggerFactory.getLogger(TestExportSnapshotV1NoCluster.class);
 
-  private static final Logger LOG = LoggerFactory.getLogger(TestExportSnapshotNoCluster.class);
+  private HBaseCommonTestingUtility testUtil = new HBaseCommonTestingUtility();
-
-  private HBaseCommonTestingUtility testUtil;
-  private FileSystem fs;
   private Path testDir;
 
-  public void setUpBaseConf(Configuration conf) {
-    conf.setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);
-    conf.setInt("hbase.regionserver.msginterval", 100);
-    conf.setInt("hbase.client.pause", 250);
-    conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);
-    conf.setBoolean("hbase.master.enabletable.roundrobin", true);
-    conf.setInt("mapreduce.map.maxattempts", 10);
-    conf.set(HConstants.HBASE_DIR, testDir.toString());
-  }
-
   @Before
   public void setUpBefore() throws Exception {
-    this.testUtil = new HBaseCommonTestingUtility();
+    this.testDir = setup(this.testUtil);
-    // Make sure testDir is on LocalFileSystem
-    testDir = testUtil.getDataTestDir().makeQualified(URI.create("file:///"), new Path("/"));
-    fs = testDir.getFileSystem(testUtil.getConfiguration());
-    assertTrue("FileSystem '" + fs + "' is not local", fs instanceof LocalFileSystem);
-
-    setUpBaseConf(testUtil.getConfiguration());
   }
 
+  /**
+   * Setup for test. Returns path to test data dir.
+   */
+  static Path setup(HBaseCommonTestingUtility hctu) throws IOException {
+    // Make sure testDir is on LocalFileSystem
+    Path testDir =
+      hctu.getDataTestDir().makeQualified(URI.create("file:///"), new Path("/"));
+    FileSystem fs = testDir.getFileSystem(hctu.getConfiguration());
+    assertTrue("FileSystem '" + fs + "' is not local", fs instanceof LocalFileSystem);
+    hctu.getConfiguration().setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);
+    hctu.getConfiguration().setInt("hbase.regionserver.msginterval", 100);
+    hctu.getConfiguration().setInt("hbase.client.pause", 250);
+    hctu.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);
+    hctu.getConfiguration().setBoolean("hbase.master.enabletable.roundrobin", true);
+    hctu.getConfiguration().setInt("mapreduce.map.maxattempts", 10);
+    hctu.getConfiguration().set(HConstants.HBASE_DIR, testDir.toString());
+    return testDir;
+  }
+
+  /**
+   * V1 snapshot test
+   */
   @Test
-  public void testSnapshotV1WithRefsExportFileSystemState() throws Exception {
+  public void testSnapshotWithRefsExportFileSystemState() throws Exception {
-    final SnapshotMock snapshotMock = new SnapshotMock(testUtil.getConfiguration(), fs, testDir);
+    final SnapshotMock snapshotMock = new SnapshotMock(testUtil.getConfiguration(),
+      testDir.getFileSystem(testUtil.getConfiguration()), testDir);
     final SnapshotMock.SnapshotBuilder builder = snapshotMock.createSnapshotV1("tableWithRefsV1",
       "tableWithRefsV1");
-    testSnapshotWithRefsExportFileSystemState(builder);
+    testSnapshotWithRefsExportFileSystemState(builder, testUtil, testDir);
-  }
-
-  @Test
-  public void testSnapshotV2WithRefsExportFileSystemState() throws Exception {
-    final SnapshotMock snapshotMock = new SnapshotMock(testUtil.getConfiguration(), fs, testDir);
-    final SnapshotMock.SnapshotBuilder builder = snapshotMock.createSnapshotV2("tableWithRefsV2",
-      "tableWithRefsV2");
-    testSnapshotWithRefsExportFileSystemState(builder);
   }
 
   /**
    * Generates a couple of regions for the specified SnapshotMock,
    * and then it will run the export and verification.
    */
-  private void testSnapshotWithRefsExportFileSystemState(SnapshotMock.SnapshotBuilder builder)
+  static void testSnapshotWithRefsExportFileSystemState(SnapshotMock.SnapshotBuilder builder,
-      throws Exception {
+      HBaseCommonTestingUtility testUtil, Path testDir) throws Exception {
     Path[] r1Files = builder.addRegion();
     Path[] r2Files = builder.addRegion();
     builder.commit();
@@ -106,10 +106,10 @@ public class TestExportSnapshotNoCluster {
     TableName tableName = builder.getTableDescriptor().getTableName();
     TestExportSnapshot.testExportFileSystemState(testUtil.getConfiguration(),
       tableName, snapshotName, snapshotName, snapshotFilesCount,
-      testDir, getDestinationDir(), false, null, true);
+      testDir, getDestinationDir(testDir), false, null, true);
   }
 
-  private Path getDestinationDir() {
+  static Path getDestinationDir(Path testDir) {
     Path path = new Path(new Path(testDir, "export-test"), "export-" + System.currentTimeMillis());
     LOG.info("HDFS export destination path: " + path);
     return path;

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

@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.snapshot;
+
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils.SnapshotMock;
+import org.apache.hadoop.hbase.testclassification.MapReduceTests;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Test Export Snapshot Tool; tests v2 snapshots.
+ * @see TestExportSnapshotV1NoCluster
+ */
+@Category({MapReduceTests.class, MediumTests.class})
+public class TestExportSnapshotV2NoCluster {
+  @ClassRule
+  public static final HBaseClassTestRule CLASS_RULE =
+      HBaseClassTestRule.forClass(TestExportSnapshotV2NoCluster.class);
+
+  private static final Logger LOG = LoggerFactory.getLogger(TestExportSnapshotV2NoCluster.class);
+
+  private HBaseCommonTestingUtility testUtil = new HBaseCommonTestingUtility();
+  private Path testDir;
+
+  @Before
+  public void before() throws Exception {
+    this.testDir = TestExportSnapshotV1NoCluster.setup(this.testUtil);
+  }
+
+  @Test
+  public void testSnapshotWithRefsExportFileSystemState() throws Exception {
+    final SnapshotMock snapshotMock = new SnapshotMock(testUtil.getConfiguration(),
+      testDir.getFileSystem(testUtil.getConfiguration()), testDir);
+    final SnapshotMock.SnapshotBuilder builder = snapshotMock.createSnapshotV2("tableWithRefsV2",
+      "tableWithRefsV2");
+    TestExportSnapshotV1NoCluster.testSnapshotWithRefsExportFileSystemState(builder, this.testUtil,
+      this.testDir);
+  }
+}