From 8ed07bd3e6b6a8af3b82e9a085c74be29f8dfd87 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Mon, 15 Feb 2016 19:08:03 +0900
Subject: [PATCH] HDFS-9765. TestBlockScanner#testVolumeIteratorWithCaching
 fails intermittently. (aajisaka)

---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                    | 3 +++
 .../apache/hadoop/hdfs/server/datanode/TestBlockScanner.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index d144ba78d6..e9160c9959 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2850,6 +2850,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
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockScanner.java
index acd5a476f9..4628a4651b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockScanner.java
+++ b/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);
   }