From 8377683b63d91a1cd13fc537ad80931925cade88 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Mon, 15 Feb 2016 19:08:03 +0900 Subject: [PATCH] HDFS-9765. TestBlockScanner#testVolumeIteratorWithCaching fails intermittently. (aajisaka) (cherry picked from commit 8ed07bd3e6b6a8af3b82e9a085c74be29f8dfd87) (cherry picked from commit 8dec72bfd73174bdc2dfa8ce845b28af48a6bca4) --- 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 a7e2ee89b1c..30d1d2326c9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -102,6 +102,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 735e9a12b0b..e20fa800ceb 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 @@ -244,7 +244,7 @@ public class TestBlockScanner { testVolumeIteratorImpl(5, 0); } - @Test(timeout=60000) + @Test(timeout=300000) public void testVolumeIteratorWithCaching() throws Exception { testVolumeIteratorImpl(600, 100); }