refactor unit test.

Author: hfutatzhanghb

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

@@ -86,7 +86,7 @@ public class TestRouterMountTable {
   public static void globalSetUp() throws Exception {
     startTime = Time.now();
 
-    // Build and start a federated cluster
+    // Build and start a federated cluster.
     cluster = new StateStoreDFSCluster(false, 2);
     Configuration conf = new RouterConfigBuilder()
         .stateStore()
@@ -99,7 +99,7 @@ public static void globalSetUp() throws Exception {
     cluster.startRouters();
     cluster.waitClusterUp();
 
-    // Get the end points
+    // Get the end points.
     nnContext0 = cluster.getNamenode("ns0", null);
     nnContext1 = cluster.getNamenode("ns1", null);
     nnFs0 = nnContext0.getFileSystem();
@@ -139,18 +139,18 @@ public void clearMountTable() throws IOException {
   @Test
   public void testReadOnly() throws Exception {
 
-    // Add a read only entry
+    // Add a read only entry.
     MountTable readOnlyEntry = MountTable.newInstance(
         "/readonly", Collections.singletonMap("ns0", "/testdir"));
     readOnlyEntry.setReadOnly(true);
     assertTrue(addMountTable(readOnlyEntry));
 
-    // Add a regular entry
+    // Add a regular entry.
     MountTable regularEntry = MountTable.newInstance(
         "/regular", Collections.singletonMap("ns0", "/testdir"));
     assertTrue(addMountTable(regularEntry));
 
-    // Create a folder which should show in all locations
+    // Create a folder which should show in all locations.
     assertTrue(routerFs.mkdirs(new Path("/regular/newdir")));
 
     FileStatus dirStatusNn =
@@ -163,7 +163,7 @@ public void testReadOnly() throws Exception {
         routerFs.getFileStatus(new Path("/readonly/newdir"));
     assertTrue(dirStatusReadOnly.isDirectory());
 
-    // It should fail writing into a read only path
+    // It should fail writing into a read only path.
     try {
       routerFs.mkdirs(new Path("/readonly/newdirfail"));
       fail("We should not be able to write into a read only mount point");
@@ -188,7 +188,7 @@ private boolean addMountTable(final MountTable entry) throws IOException {
     AddMountTableEntryResponse addResponse =
         mountTableManager.addMountTableEntry(addRequest);
 
-    // Reload the Router cache
+    // Reload the Router cache.
     mountTable.loadCache(true);
 
     return addResponse.getStatus();
@@ -208,7 +208,7 @@ private boolean updateMountTable(final MountTable entry) throws IOException {
     UpdateMountTableEntryResponse updateResponse =
         mountTableManager.updateMountTableEntry(updateRequest);
 
-    // Reload the Router cache
+    // Reload the Router cache.
     mountTable.loadCache(true);
 
     return updateResponse.getStatus();
@@ -220,7 +220,7 @@ private boolean updateMountTable(final MountTable entry) throws IOException {
    */
   @Test
   public void testMountPointLimit() throws Exception {
-    // Add mount table entry
+    // Add mount table entry.
     MountTable addEntry = MountTable.newInstance("/testdir-shortlength",
         Collections.singletonMap("ns0", "/testdir-shortlength"));
     assertTrue(addMountTable(addEntry));
@@ -249,7 +249,7 @@ public void testMountPointLimit() throws Exception {
   @Test
   public void testListFilesTime() throws Exception {
     try {
-      // Add mount table entry
+      // Add mount table entry.
       MountTable addEntry = MountTable.newInstance("/testdir",
           Collections.singletonMap("ns0", "/testdir"));
       assertTrue(addMountTable(addEntry));
@@ -266,7 +266,7 @@ public void testListFilesTime() throws Exception {
           Collections.singletonMap("ns0", "/test"));
       assertTrue(addMountTable(addEntry));
 
-      // Create test dir in NN
+      // Create test dir in NN.
       assertTrue(nnFs0.mkdirs(new Path("/newdir")));
 
       Map<String, Long> pathModTime = new TreeMap<>();
@@ -288,12 +288,12 @@ public void testListFilesTime() throws Exception {
       for (FileStatus file : iterator) {
         pathModTime.put(file.getPath().getName(), file.getModificationTime());
       }
-      // Fetch listing
+      // Fetch listing.
       DirectoryListing listing =
           routerProtocol.getListing("/", HdfsFileStatus.EMPTY_NAME, false);
       Iterator<String> pathModTimeIterator = pathModTime.keySet().iterator();
 
-      // Match date/time for each path returned
+      // Match date/time for each path returned.
       for (HdfsFileStatus f : listing.getPartialListing()) {
         String fileName = pathModTimeIterator.next();
         String currentFile = f.getFullPath(new Path("/")).getName();
@@ -304,7 +304,7 @@ public void testListFilesTime() throws Exception {
         assertTrue(currentTime > startTime);
         assertEquals(currentTime, expectedTime);
       }
-      // Verify the total number of results found/matched
+      // Verify the total number of results found/matched.
       assertEquals(pathModTime.size(), listing.getPartialListing().length);
     } finally {
       nnFs0.delete(new Path("/newdir"), true);
@@ -646,7 +646,7 @@ public void testPathInException() throws Exception {
   @Test
   public void testGetListingWithTrailingSlash() throws IOException {
     try {
-      // Add mount table entry
+      // Add mount table entry.
       MountTable addEntry = MountTable.newInstance("/testlist",
           Collections.singletonMap("ns0", "/testlist"));
       assertTrue(addMountTable(addEntry));
@@ -659,11 +659,11 @@ public void testGetListingWithTrailingSlash() throws IOException {
 
       nnFs0.mkdirs(new Path("/testlist/tmp0"));
       nnFs1.mkdirs(new Path("/testlist/tmp1"));
-      // Fetch listing
+      // Fetch listing.
       DirectoryListing list = routerProtocol.getListing(
           "/testlist/", HdfsFileStatus.EMPTY_NAME, false);
       HdfsFileStatus[] statuses = list.getPartialListing();
-      // should return tmp0 and tmp1
+      // Should return tmp0 and tmp1.
       assertEquals(2, statuses.length);
     } finally {
       nnFs0.delete(new Path("/testlist/tmp0"), true);
@@ -674,7 +674,7 @@ public void testGetListingWithTrailingSlash() throws IOException {
   @Test
   public void testGetFileInfoWithMountPoint() throws IOException {
     try {
-      // Add mount table entry
+      // Add mount table entry.
       MountTable addEntry = MountTable.newInstance("/testgetfileinfo/ns1/dir",
           Collections.singletonMap("ns1", "/testgetfileinfo/ns1/dir"));
       assertTrue(addMountTable(addEntry));
@@ -740,27 +740,27 @@ public void testRenameMountPoint() throws Exception {
       nnFs0.mkdirs(new Path("/testrename1/sub/sub"));
       nnFs0.mkdirs(new Path("/testrename2"));
 
-      // Success: rename a directory to a mount point
+      // Success: rename a directory to a mount point.
       assertTrue(nnFs0.exists(new Path("/testrename1/sub/sub")));
       assertFalse(nnFs0.exists(new Path("/testrename2/sub")));
       assertTrue(routerFs.rename(new Path("/testrename1/sub/sub"),
           new Path("/testrename2")));
       assertFalse(nnFs0.exists(new Path("/testrename1/sub/sub")));
       assertTrue(nnFs0.exists(new Path("/testrename2/sub")));
 
-      // Fail: the target already exists
+      // Fail: the target already exists.
       nnFs0.mkdirs(new Path("/testrename1/sub/sub"));
       assertFalse(routerFs.rename(new Path("/testrename1/sub/sub"),
               new Path("/testrename2")));
 
-      // Fail: The src is a mount point
+      // Fail: The src is a mount point.
       LambdaTestUtils.intercept(AccessControlException.class,
           "The operation is not allowed because the path: "
               + "/testrename1/sub is a mount point",
           () -> routerFs.rename(new Path("/testrename1/sub"),
               new Path("/testrename2/sub")));
 
-      // Fail: There is a mount point under the src
+      // Fail: There is a mount point under the src.
       LambdaTestUtils.intercept(AccessControlException.class,
           "The operation is not allowed because there are mount points: "
               + "sub under the path: /testrename1",
@@ -791,7 +791,7 @@ public void testListStatusMountPoint() throws Exception {
   @Test
   public void testGetEnclosingRoot() throws Exception {
 
-    // Add a read only entry
+    // Add a read only entry.
     MountTable readOnlyEntry = MountTable.newInstance(
         "/readonly", Collections.singletonMap("ns0", "/testdir"));
     readOnlyEntry.setReadOnly(true);
@@ -802,13 +802,13 @@ public void testGetEnclosingRoot() throws Exception {
     assertEquals(routerFs.getEnclosingRoot(new Path("/regular")),
         routerFs.getEnclosingRoot(routerFs.getEnclosingRoot(new Path("/regular"))));
 
-    // Add a regular entry
+    // Add a regular entry.
     MountTable regularEntry = MountTable.newInstance(
         "/regular", Collections.singletonMap("ns0", "/testdir"));
     assertTrue(addMountTable(regularEntry));
     assertEquals(routerFs.getEnclosingRoot(new Path("/regular")), new Path("/regular"));
 
-    // path does not need to exist
+    // Path does not need to exist.
     assertEquals(routerFs.getEnclosingRoot(new Path("/regular/pathDNE")), new Path("/regular"));
 
   }

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

@@ -18,37 +18,17 @@
 package org.apache.hadoop.hdfs.server.federation.router.async;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.server.federation.RouterConfigBuilder;
 import org.apache.hadoop.hdfs.server.federation.StateStoreDFSCluster;
-import org.apache.hadoop.hdfs.server.federation.resolver.MountTableManager;
 import org.apache.hadoop.hdfs.server.federation.resolver.MountTableResolver;
 import org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys;
 import org.apache.hadoop.hdfs.server.federation.router.Router;
-import org.apache.hadoop.hdfs.server.federation.router.RouterClient;
 import org.apache.hadoop.hdfs.server.federation.router.TestRouterMountTable;
-import org.apache.hadoop.hdfs.server.federation.store.protocol.AddMountTableEntryRequest;
-import org.apache.hadoop.hdfs.server.federation.store.protocol.AddMountTableEntryResponse;
-import org.apache.hadoop.hdfs.server.federation.store.protocol.GetMountTableEntriesRequest;
-import org.apache.hadoop.hdfs.server.federation.store.protocol.GetMountTableEntriesResponse;
-import org.apache.hadoop.hdfs.server.federation.store.protocol.RemoveMountTableEntryRequest;
-import org.apache.hadoop.hdfs.server.federation.store.records.MountTable;
-import org.apache.hadoop.test.LambdaTestUtils;
 import org.apache.hadoop.util.Time;
-import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Collections;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 /**
  * Test a router end-to-end including the MountTable using async rpc.
  */
@@ -84,81 +64,4 @@ public static void globalSetUp() throws Exception {
     routerProtocol = routerContext.getClient().getNamenode();
     mountTable = (MountTableResolver) router.getSubclusterResolver();
   }
-
-  @AfterClass
-  public static void tearDown() {
-    if (cluster != null) {
-      cluster.stopRouter(routerContext);
-      cluster.shutdown();
-      cluster = null;
-    }
-  }
-
-  @After
-  public void clearMountTable() throws IOException {
-    RouterClient client = routerContext.getAdminClient();
-    MountTableManager mountTableManager = client.getMountTableManager();
-    GetMountTableEntriesRequest req1 =
-        GetMountTableEntriesRequest.newInstance("/");
-    GetMountTableEntriesResponse response =
-        mountTableManager.getMountTableEntries(req1);
-    for (MountTable entry : response.getEntries()) {
-      RemoveMountTableEntryRequest req2 =
-          RemoveMountTableEntryRequest.newInstance(entry.getSourcePath());
-      mountTableManager.removeMountTableEntry(req2);
-    }
-    mountTable.setDefaultNSEnable(true);
-  }
-
-  /**
-   * Add a mount table entry to the mount table through the admin API.
-   * @param entry Mount table entry to add.
-   * @return If it was succesfully added.
-   * @throws IOException Problems adding entries.
-   */
-  private boolean addMountTable(final MountTable entry) throws IOException {
-    RouterClient client = routerContext.getAdminClient();
-    MountTableManager mountTableManager = client.getMountTableManager();
-    AddMountTableEntryRequest addRequest =
-        AddMountTableEntryRequest.newInstance(entry);
-    AddMountTableEntryResponse addResponse =
-        mountTableManager.addMountTableEntry(addRequest);
-
-    // Reload the Router cache.
-    mountTable.loadCache(true);
-
-    return addResponse.getStatus();
-  }
-
-  @Test
-  public void testGetEnclosingRoot() throws Exception {
-    // Add a read only entry.
-    MountTable readOnlyEntry = MountTable.newInstance(
-        "/readonly", Collections.singletonMap("ns0", "/testdir"));
-    readOnlyEntry.setReadOnly(true);
-    assertTrue(addMountTable(readOnlyEntry));
-    assertEquals(routerFs.getEnclosingRoot(new Path("/readonly")), new Path("/readonly"));
-
-    assertEquals(routerFs.getEnclosingRoot(new Path("/regular")), new Path("/"));
-    assertEquals(routerFs.getEnclosingRoot(new Path("/regular")),
-        routerFs.getEnclosingRoot(routerFs.getEnclosingRoot(new Path("/regular"))));
-
-    // Add a regular entry.
-    MountTable regularEntry = MountTable.newInstance(
-        "/regular", Collections.singletonMap("ns0", "/testdir"));
-    assertTrue(addMountTable(regularEntry));
-    assertEquals(routerFs.getEnclosingRoot(new Path("/regular")), new Path("/regular"));
-
-    // Path does not need to exist.
-    assertEquals(routerFs.getEnclosingRoot(new Path("/regular/pathDNE")), new Path("/regular"));
-  }
-
-  @Test
-  public void testListNonExistPath() throws Exception {
-    mountTable.setDefaultNSEnable(false);
-    LambdaTestUtils.intercept(FileNotFoundException.class,
-        "File /base does not exist.",
-        "Expect FileNotFoundException.",
-        () -> routerFs.listStatus(new Path("/base")));
-  }
 }