HDFS-9765. TestBlockScanner#testVolumeIteratorWithCaching fails intermittently. (aajisaka)

(cherry picked from commit 8ed07bd3e6)
(cherry picked from commit 8dec72bfd7)

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -1847,6 +1847,9 @@ Release 2.7.3 - UNRELEASED
     HDFS-9784. Example usage is not correct in Transparent Encryption document.
     (Takashi Ohnishi via aajisaka)
 
+    HDFS-9765. TestBlockScanner#testVolumeIteratorWithCaching fails
+    intermittently. (aajisaka)
+
 Release 2.7.2 - 2016-01-25
 
   INCOMPATIBLE CHANGES

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockScanner.java

@@ -245,7 +245,7 @@ public class TestBlockScanner {
     testVolumeIteratorImpl(5, 0);
   }
 
-  @Test(timeout=60000)
+  @Test(timeout=300000)
   public void testVolumeIteratorWithCaching() throws Exception {
     testVolumeIteratorImpl(600, 100);
   }