ferhui commented on a change in pull request #3386:
URL: https://github.com/apache/hadoop/pull/3386#discussion_r712303703
##########
File path:
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestFsDatasetImpl.java
##########
@@ -1344,26 +1359,34 @@ public void testDnRestartWithHardLink() {
assertTrue(Files.exists(Paths.get(newReplicaInfo.getBlockURI())));
assertTrue(Files.exists(Paths.get(oldReplicaInfo.getBlockURI())));
- DirectoryScanner scanner = new DirectoryScanner(
- cluster.getDataNodes().get(0).getFSDataset(), conf);
+ // Before starting Dir Scanner, we should enable deleteDuplicateReplicas.
+ FsDatasetSpi<?> fsDataset = cluster.getDataNodes().get(0).getFSDataset();
+ DirectoryScanner scanner = new DirectoryScanner(fsDataset, conf);
+ FsVolumeImpl fsVolume =
+ (FsVolumeImpl) fsDataset.getFsVolumeReferences().get(0);
+ fsVolume.getBlockPoolSlice(fsVolume.getBlockPoolList()[0])
+ .setDeleteDuplicateReplicasForTests(true);
scanner.start();
scanner.run();
- GenericTestUtils.waitFor(new Supplier<Boolean>() {
- @Override public Boolean get() {
- return !Files.exists(Paths.get(oldReplicaInfo.getBlockURI()));
- }
- }, 100, 10000);
+ GenericTestUtils.waitFor(
+ () -> !Files.exists(Paths.get(oldReplicaInfo.getBlockURI())),
+ 100, 10000, "Old replica is not deleted by DirScanner even after "
+ + "10s of waiting has elapsed");
assertTrue(Files.exists(Paths.get(newReplicaInfo.getBlockURI())));
validateFileLen(fs, fileLen, filePath);
- } catch (Exception ex) {
- LOG.info("Exception in testDnRestartWithHardLink ", ex);
- fail("Exception while testing testDnRestartWithHardLink ");
+ // Additional tests to ensure latest replica gets deleted after file
+ // deletion.
+ fs.delete(filePath, false);
+ GenericTestUtils.waitFor(
+ () -> !Files.exists(Paths.get(newReplicaInfo.getBlockURI())),
+ 100, 10000);
} finally {
- if (cluster.isClusterUp()) {
- cluster.shutdown();
+ conf.unset(DFSConfigKeys.DFS_DATANODE_DUPLICATE_REPLICA_DELETION);
Review comment:
Maybe we need to reserve original value and set it finally
--
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]
