Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4C09518126 for ; Tue, 19 Apr 2016 10:57:05 +0000 (UTC) Received: (qmail 55055 invoked by uid 500); 19 Apr 2016 10:57:05 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 54985 invoked by uid 500); 19 Apr 2016 10:57:05 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 54976 invoked by uid 99); 19 Apr 2016 10:57:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Apr 2016 10:57:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C4E89DFC15; Tue, 19 Apr 2016 10:57:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: waltersu4549@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-9744. TestDirectoryScanner#testThrottling occasionally time out after 300 seconds. Contributed by Lin Yiqun. Date: Tue, 19 Apr 2016 10:57:04 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 4b4df2cd4 -> 90d1af141 HDFS-9744. TestDirectoryScanner#testThrottling occasionally time out after 300 seconds. Contributed by Lin Yiqun. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/90d1af14 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/90d1af14 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/90d1af14 Branch: refs/heads/trunk Commit: 90d1af141666ba12f18d44464cb6169c445d0902 Parents: 4b4df2c Author: Walter Su Authored: Tue Apr 19 18:54:11 2016 +0800 Committer: Walter Su Committed: Tue Apr 19 18:54:11 2016 +0800 ---------------------------------------------------------------------- .../apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/90d1af14/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java index d860107..48d4681 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java @@ -560,7 +560,7 @@ public class TestDirectoryScanner { * * @throws Exception thrown on unexpected failure */ - @Test (timeout=300000) + @Test (timeout=600000) public void testThrottling() throws Exception { Configuration conf = new Configuration(CONF);