RBF: mv test to TestRouterRPCMultipleDestinationMountTableResolver

Author: xiezhineng

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAllResolver.java

@@ -48,7 +48,6 @@
 import org.apache.hadoop.hdfs.server.federation.store.protocol.GetMountTableEntriesResponse;
 import org.apache.hadoop.hdfs.server.federation.store.records.MountTable;
 import org.apache.hadoop.hdfs.server.namenode.TestFileTruncate;
-import org.apache.hadoop.test.LambdaTestUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -206,23 +205,6 @@ private void testAll(final String path) throws Exception {
     assertDirsEverywhere(path, 9);
     assertFilesDistributed(path, 16);
 
-    // Test rename to not multi mount dir
-    routerFs.mkdirs(new Path(path+ "/dir2/dir23"));
-    routerFs.mkdirs(new Path(path+ "/dir2/dir23/dir_1"));
-    routerFs.mkdirs(new Path(path+ "/dir2/dir23/dir_2"));
-    LambdaTestUtils.intercept(IOException.class, "The number of" +
-            " remote locations for both source and target should be same.",
-        () ->{
-          routerFs.rename(new Path(path+ "/dir2/dir23/dir_1"),
-              new Path("/NOT_MULTI_MOUNT_DIR"));
-        });
-    routerFs.delete(new Path(path + "/dir2/dir23"), true);
-
-    // Removing a directory should remove it from every subcluster
-    routerFs.delete(new Path(path + "/dir2/dir22/dir220"), true);
-    assertDirsEverywhere(path, 8);
-    assertFilesDistributed(path, 10);
-
     // Removing all sub directories
     routerFs.delete(new Path(path + "/dir0"), true);
     routerFs.delete(new Path(path + "/dir1"), true);

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRPCMultipleDestinationMountTableResolver.java

@@ -720,6 +720,48 @@ public void testWriteWithUnavailableSubCluster() throws IOException {
     }
   }
 
+  /**
+   *  Test rename a dir from src dir (mapped to both ns0 and ns1) to ns0
+   */
+  @Test
+  public void testRenameWithMultiDestinations() throws Exception {
+    //create a mount point with multiple destinations
+    String srcDir = "/mount-source-dir";
+    Path path = new Path(srcDir);
+    Map<String, String> destMap = new HashMap<>();
+    destMap.put("ns0", srcDir);
+    destMap.put("ns1", srcDir);
+    nnFs0.mkdirs(path);
+    nnFs1.mkdirs(path);
+    MountTable addEntry =
+        MountTable.newInstance(srcDir, destMap);
+    addEntry.setDestOrder(DestinationOrder.RANDOM);
+    addEntry.setFaultTolerant(true);
+    assertTrue(addMountTable(addEntry));
+
+    //create a mount point with a single destinations ns0
+    String targetDir = "/ns0_test";
+    nnFs0.mkdirs(new Path(targetDir));
+    MountTable addDstEntry = MountTable.newInstance(targetDir,
+        Collections.singletonMap("ns0", targetDir));
+    assertTrue(addMountTable(addDstEntry));
+
+    //mkdir sub dirs in srcDir  mapping ns0 & ns1
+    routerFs.mkdirs(new Path(srcDir + "/dir1"));
+    routerFs.mkdirs(new Path(srcDir + "/dir1/dir_11"));
+    routerFs.mkdirs(new Path(srcDir + "/dir1/dir_12"));
+    routerFs.mkdirs(new Path(targetDir));
+
+    //try to rename sub dir in srcDir (mapping to ns0 & ns1) to targetDir
+    // (mapping ns0)
+    LambdaTestUtils.intercept(IOException.class, "The number of" +
+            " remote locations for both source and target should be same.",
+        () -> {
+          routerFs.rename(new Path(srcDir + "/dir1/dir_11"),
+              new Path(targetDir));
+        });
+  }
+
   /**
    * Test to verify rename operation on directories in case of multiple
    * destinations.