Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-3985. Add timeouts to TestMulitipleNNDataBlockScanner. Contributed by Todd Lipcon 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398875 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-10-16 16:29:40 +00:00
parent da255e41f4
commit 20a5d16b2d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -117,6 +117,8 @@ Release 2.0.3-alpha - Unreleased
HDFS-4058. DirectoryScanner may fail with IOOB if the directory HDFS-4058. DirectoryScanner may fail with IOOB if the directory
scanning threads return out of volume order. (eli) scanning threads return out of volume order. (eli)
HDFS-3985. Add timeouts to TestMulitipleNNDataBlockScanner. (todd via eli)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

10
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestMultipleNNDataBlockScanner.java
View File

@ -74,7 +74,7 @@ public class TestMultipleNNDataBlockScanner {
} }
} }
@Test @Test(timeout=120000)
public void testDataBlockScanner() throws IOException, InterruptedException { public void testDataBlockScanner() throws IOException, InterruptedException {
setUp(); setUp();
try { try {
@ -97,7 +97,7 @@ public class TestMultipleNNDataBlockScanner {
} }
} }
@Test @Test(timeout=120000)
public void testBlockScannerAfterRefresh() throws IOException, public void testBlockScannerAfterRefresh() throws IOException,
InterruptedException { InterruptedException {
setUp(); setUp();
@ -149,7 +149,7 @@ public class TestMultipleNNDataBlockScanner {
} }
} }
@Test @Test(timeout=120000)
public void testBlockScannerAfterRestart() throws IOException, public void testBlockScannerAfterRestart() throws IOException,
InterruptedException { InterruptedException {
setUp(); setUp();
@ -176,7 +176,7 @@ public class TestMultipleNNDataBlockScanner {
} }
} }
@Test @Test(timeout=120000)
public void test2NNBlockRescanInterval() throws IOException { public void test2NNBlockRescanInterval() throws IOException {
((Log4JLogger)BlockPoolSliceScanner.LOG).getLogger().setLevel(Level.ALL); ((Log4JLogger)BlockPoolSliceScanner.LOG).getLogger().setLevel(Level.ALL);
Configuration conf = new HdfsConfiguration(); Configuration conf = new HdfsConfiguration();
@ -206,7 +206,7 @@ public class TestMultipleNNDataBlockScanner {
* *
* @throws Exception * @throws Exception
*/ */
@Test @Test(timeout=120000)
public void testBlockRescanInterval() throws IOException { public void testBlockRescanInterval() throws IOException {
((Log4JLogger)BlockPoolSliceScanner.LOG).getLogger().setLevel(Level.ALL); ((Log4JLogger)BlockPoolSliceScanner.LOG).getLogger().setLevel(Level.ALL);
Configuration conf = new HdfsConfiguration(); Configuration conf = new HdfsConfiguration();