HDFS-14669. TestDirectoryScanner#testDirectoryScannerInFederatedCluster fails intermittently in trunk. Contributed by qiang Liu.

ayushtkn · ayushtkn · commit 8f40856f762b · 2019-08-03T12:15:41.000+05:30
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java
@@ -1233,8 +1233,8 @@ public long getRandomBlockId() {
 
   private void writeFile(FileSystem fs, int numFiles) throws IOException {
     final String fileName = "/" + GenericTestUtils.getMethodName();
-    final Path filePath = new Path(fileName);
     for (int i = 0; i < numFiles; i++) {
+      final Path filePath = new Path(fileName + i);
       DFSTestUtil.createFile(fs, filePath, 1, (short) 1, 0);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -1233,8 +1233,8 @@ public long getRandomBlockId() {`
`1233`	`1233`
`1234`	`1234`	`private void writeFile(FileSystem fs, int numFiles) throws IOException {`
`1235`	`1235`	`final String fileName = "/" + GenericTestUtils.getMethodName();`
`1236`		`- final Path filePath = new Path(fileName);`
`1237`	`1236`	`for (int i = 0; i < numFiles; i++) {`
	`1237`	`+ final Path filePath = new Path(fileName + i);`
`1238`	`1238`	`DFSTestUtil.createFile(fs, filePath, 1, (short) 1, 0);`
`1239`	`1239`	`}`
`1240`	`1240`	`}`