haiyang1987 commented on code in PR #6980:
URL: https://github.com/apache/hadoop/pull/6980#discussion_r1703134443
##########
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/mover/TestMover.java:
##########
@@ -1005,6 +1011,146 @@ public void testMoverWithStripedFile() throws Exception
{
}
}
+ @Test(timeout = 300000)
+ public void testMoverWithStripedFileMaintenance() throws Exception {
+ final Configuration conf = new HdfsConfiguration();
+ initConfWithStripe(conf);
+
+ // Start 9 datanodes
+ int numOfDatanodes = 9;
+ int storagesPerDatanode = 2;
+ long capacity = 9 * defaultBlockSize;
+ long[][] capacities = new long[numOfDatanodes][storagesPerDatanode];
+ for (int i = 0; i < numOfDatanodes; i++) {
+ for(int j = 0; j < storagesPerDatanode; j++){
+ capacities[i][j] = capacity;
+ }
+ }
+ final MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf)
+ .numDataNodes(numOfDatanodes)
+ .storagesPerDatanode(storagesPerDatanode)
+ .storageTypes(new StorageType[][]{
+ {StorageType.SSD, StorageType.SSD},
+ {StorageType.SSD, StorageType.SSD},
+ {StorageType.SSD, StorageType.SSD},
+ {StorageType.SSD, StorageType.SSD},
+ {StorageType.SSD, StorageType.SSD},
+ {StorageType.SSD, StorageType.SSD},
+ {StorageType.SSD, StorageType.SSD},
+ {StorageType.SSD, StorageType.SSD},
+ {StorageType.SSD, StorageType.SSD}})
+ .storageCapacities(capacities)
+ .build();
+
+ try {
+ cluster.waitActive();
+ cluster.getFileSystem().enableErasureCodingPolicy(
+ StripedFileTestUtil.getDefaultECPolicy().getName());
+
+ ClientProtocol client = NameNodeProxies.createProxy(conf,
+ cluster.getFileSystem(0).getUri(), ClientProtocol.class).getProxy();
+ String barDir = "/bar";
+ client.mkdirs(barDir, new FsPermission((short) 777), true);
+ // Set "/bar" directory with ALL_SSD storage policy.
+ client.setStoragePolicy(barDir, "ALL_SSD");
+ // Set an EC policy on "/bar" directory
+ client.setErasureCodingPolicy(barDir,
+ StripedFileTestUtil.getDefaultECPolicy().getName());
+
+ // Write file to barDir
+ final String fooFile = "/bar/foo";
+ long fileLen = 6 * defaultBlockSize;
+ DFSTestUtil.createFile(cluster.getFileSystem(), new Path(fooFile),
+ fileLen,(short) 3, 0);
+
+ // Verify storage types and locations
+ LocatedBlocks locatedBlocks =
+ client.getBlockLocations(fooFile, 0, fileLen);
+ DatanodeInfoWithStorage location = null;
+ for(LocatedBlock lb : locatedBlocks.getLocatedBlocks()){
+ location = lb.getLocations()[8];
+ for(StorageType type : lb.getStorageTypes()){
+ Assert.assertEquals(StorageType.SSD, type);
+ }
+ }
+
+ // Maintain the last datanode later
+ FSNamesystem ns = cluster.getNamesystem(0);
+ DatanodeManager datanodeManager =
ns.getBlockManager().getDatanodeManager();
+ DatanodeDescriptor dn =
datanodeManager.getDatanode(location.getDatanodeUuid());
+
+ StripedFileTestUtil.verifyLocatedStripedBlocks(locatedBlocks,
+ dataBlocks + parityBlocks);
+
+ // Start 5 more datanodes for mover
+ capacities = new long[5][storagesPerDatanode];
+ for (int i = 0; i < 5; i++) {
+ for(int j = 0; j < storagesPerDatanode; j++){
+ capacities[i][j] = capacity;
+ }
+ }
+ cluster.startDataNodes(conf, 5,
+ new StorageType[][]{
+ {StorageType.DISK, StorageType.DISK},
+ {StorageType.DISK, StorageType.DISK},
+ {StorageType.DISK, StorageType.DISK},
+ {StorageType.DISK, StorageType.DISK},
+ {StorageType.DISK, StorageType.DISK}},
+ true, null, null, null, capacities,
+ null, false, false, false, null, null, null);
+ cluster.triggerHeartbeats();
+
+ // Move blocks to DISK
+ client.setStoragePolicy(barDir, "HOT");
+ int rc = ToolRunner.run(conf, new Mover.Cli(),
+ new String[] { "-p", barDir });
+
Review Comment:
How about add verify the number of DISK storage types of logic？
```
// Verify the number of DISK storage types
waitForLocatedBlockWithDiskStorageType(cluster.getFileSystem(), fooFile, 5);
```
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
