HDFS-16609. Fix Flakes Junit Tests that often report timeouts. (#4382). Contributed by fanshilun.

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java

@@ -1410,7 +1410,7 @@ public class TestDFSShell {
     }
   }
 
-  @Test (timeout = 30000)
+  @Test (timeout = 60000)
   public void testFilePermissions() throws IOException {
     Configuration conf = new HdfsConfiguration();
 

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileCreation.java

@@ -273,7 +273,7 @@ public class TestFileCreation {
               defaults.getDefaultStoragePolicyId());
       doReturn(newDefaults).when(spyNamesystem).getServerDefaults();
 
-      // Verify that the value is updated correctly. Wait for 3 seconds.
+      // Verify that the value is updated correctly. Wait for 6 seconds.
       GenericTestUtils.waitFor(()->{
         try {
           FsServerDefaults currDef = dfsClient.getServerDefaults();
@@ -282,7 +282,7 @@ public class TestFileCreation {
           // do nothing;
           return false;
         }
-      }, 1, 3000);
+      }, 1, 6000);
 
     } finally {
       cluster.shutdown();

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/sps/TestExternalStoragePolicySatisfier.java

@@ -1351,7 +1351,7 @@ public class TestExternalStoragePolicySatisfier {
    * 4. Set policy and call satisfyStoragePolicy for file.
    * 5. Block should be moved successfully.
    */
-  @Test(timeout = 300000)
+  @Test(timeout = 600000)
   public void testSPSWhenFileHasExcessRedundancyBlocks() throws Exception {
     try {
       config.set(DFSConfigKeys