Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 20FFCDF22 for ; Tue, 16 Oct 2012 16:30:07 +0000 (UTC) Received: (qmail 82926 invoked by uid 500); 16 Oct 2012 16:30:06 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 82860 invoked by uid 500); 16 Oct 2012 16:30:06 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 82852 invoked by uid 99); 16 Oct 2012 16:30:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Oct 2012 16:30:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Oct 2012 16:30:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 413AA238890D; Tue, 16 Oct 2012 16:29:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1398874 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/test/java/org/apache/hadoop/hdfs/server/datanode/TestMultipleNNDataBlockScanner.java Date: Tue, 16 Oct 2012 16:29:22 -0000 To: hdfs-commits@hadoop.apache.org From: eli@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121016162922.413AA238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: eli Date: Tue Oct 16 16:29:21 2012 New Revision: 1398874 URL: http://svn.apache.org/viewvc?rev=1398874&view=rev Log: HDFS-3985. Add timeouts to TestMulitipleNNDataBlockScanner. Contributed by Todd Lipcon Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestMultipleNNDataBlockScanner.java Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1398874&r1=1398873&r2=1398874&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Tue Oct 16 16:29:21 2012 @@ -452,6 +452,8 @@ Release 2.0.3-alpha - Unreleased HDFS-4058. DirectoryScanner may fail with IOOB if the directory 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 INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestMultipleNNDataBlockScanner.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestMultipleNNDataBlockScanner.java?rev=1398874&r1=1398873&r2=1398874&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestMultipleNNDataBlockScanner.java (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestMultipleNNDataBlockScanner.java Tue Oct 16 16:29:21 2012 @@ -74,7 +74,7 @@ public class TestMultipleNNDataBlockScan } } - @Test + @Test(timeout=120000) public void testDataBlockScanner() throws IOException, InterruptedException { setUp(); try { @@ -97,7 +97,7 @@ public class TestMultipleNNDataBlockScan } } - @Test + @Test(timeout=120000) public void testBlockScannerAfterRefresh() throws IOException, InterruptedException { setUp(); @@ -149,7 +149,7 @@ public class TestMultipleNNDataBlockScan } } - @Test + @Test(timeout=120000) public void testBlockScannerAfterRestart() throws IOException, InterruptedException { setUp(); @@ -176,7 +176,7 @@ public class TestMultipleNNDataBlockScan } } - @Test + @Test(timeout=120000) public void test2NNBlockRescanInterval() throws IOException { ((Log4JLogger)BlockPoolSliceScanner.LOG).getLogger().setLevel(Level.ALL); Configuration conf = new HdfsConfiguration(); @@ -206,7 +206,7 @@ public class TestMultipleNNDataBlockScan * * @throws Exception */ - @Test + @Test(timeout=120000) public void testBlockRescanInterval() throws IOException { ((Log4JLogger)BlockPoolSliceScanner.LOG).getLogger().setLevel(Level.ALL); Configuration conf = new HdfsConfiguration();