goiri commented on a change in pull request #2981:
URL: https://github.com/apache/hadoop/pull/2981#discussion_r630388995
##########
File path:
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/tools/federation/RouterAdmin.java
##########
@@ -1036,6 +1054,81 @@ private boolean updateQuota(String mount, long nsQuota,
long ssQuota)
return updateResponse.getStatus();
}
+ /**
+ * initViewFsToMountTable.
+ * @param clusterName The specified cluster to initialize.
Review comment:
Mention the allClusters.
##########
File path:
hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterAdminCLI.java
##########
@@ -700,6 +707,117 @@ public void testAddMountTableIfParentExist() throws
Exception {
}
}
+ @Test
+ public void testInitViewFsToMountTable() throws Exception {
+ // re-set system out for testing
+ System.setOut(new PrintStream(out));
+ stateStore.loadCache(MountTableStoreImpl.class, true);
+ String nnAddress = cluster.getRandomNamenode().
+ getNamenode().getHostAndPort();
+ String baseDir = "/initViewFs";
+ String src1 = baseDir + "/data1";
+ Path destPath1 = new Path("hdfs://" + nnAddress + src1);
+ String user1 = "user1";
+ String group1 = "group1";
+ String clusterName1 = "ClusterX";
+
+ String src2 = baseDir + "/data2";
+ String clusterName2 = "ClusterY";
+
+ String src3 = baseDir + "/inExistent";
+ Path destPath3 = new Path("hdfs://" + nnAddress + src3);
+ String clusterName3 = "ClusterZ";
+
+ // 0.mkdir destPath
+ hdfs.mkdirs(destPath1);
+ // 1.set owner
+ hdfs.setOwner(destPath1, user1, group1);
+ // 2.set viewFs mapping
+ // Use different clusterName and mount points
+ admin.getConf().set(CONFIG_VIEWFS_PREFIX + "." +
+ clusterName1 + ".link." + src1, destPath1.toString());
+ admin.getConf().set(CONFIG_VIEWFS_PREFIX + "." +
+ clusterName2 + ".link." + src2, destPath1.toString());
+
+ // 3.run initialization,Specify a ClusterName
+ String[] argv = new String[]{"-initViewFsToMountTable", clusterName1};
+ assertEquals(0, ToolRunner.run(admin, argv));
+ // 4.gets the mount point entries
+ stateStore.loadCache(MountTableStoreImpl.class, true);
+ GetMountTableEntriesRequest getRequest = GetMountTableEntriesRequest
+ .newInstance(src1);
+ GetMountTableEntriesResponse getResponse = client.getMountTableManager()
+ .getMountTableEntries(getRequest);
+ List<MountTable> mountTables = getResponse.getEntries();
+ // 5.Checking
+ assertEquals(1, mountTables.size());
+ MountTable mountTable = mountTables.get(0);
+ List<RemoteLocation> destinations = mountTable.getDestinations();
+ assertEquals(1, destinations.size());
+ assertEquals(user1, mountTable.getOwnerName());
+ assertEquals(group1, mountTable.getGroupName());
+ assertEquals(destPath1.toUri().getPath(), mountTable.
+ getDestinations().get(0).getDest());
+ assertEquals(nnAddress, mountTable.
+ getDestinations().get(0).getNameserviceId());
+ assertEquals(src1, mountTable.getSourcePath());
+
+ // Specify allCluster to initialize all mappings
+ argv = new String[]{"-rm", src1};
+ assertEquals(0, ToolRunner.run(admin, argv));
+ stateStore.loadCache(MountTableStoreImpl.class, true);
+ argv = new String[]{"-initViewFsToMountTable", "allClusters"};
+ assertEquals(0, ToolRunner.run(admin, argv));
+
+ stateStore.loadCache(MountTableStoreImpl.class, true);
Review comment:
This test got massive can we refactor and split?
##########
File path:
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/tools/federation/RouterAdmin.java
##########
@@ -1036,6 +1054,81 @@ private boolean updateQuota(String mount, long nsQuota,
long ssQuota)
return updateResponse.getStatus();
}
+ /**
+ * initViewFsToMountTable.
+ * @param clusterName The specified cluster to initialize.
+ * @return If the quota was updated.
+ * @throws IOException Error adding the mount point.
+ */
+ public boolean initViewFsToMountTable(String clusterName)
+ throws IOException {
+ // fs.viewfs.mounttable.ClusterX.link./data
+ final String mountTablePrefix;
+ if (clusterName.equals("allClusters")) {
Review comment:
Maybe make allClusters a constant.
##########
File path:
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/tools/federation/RouterAdmin.java
##########
@@ -1036,6 +1054,81 @@ private boolean updateQuota(String mount, long nsQuota,
long ssQuota)
return updateResponse.getStatus();
}
+ /**
+ * initViewFsToMountTable.
Review comment:
Extend this a little.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org
