Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BFE21200C0F for ; Thu, 2 Feb 2017 21:40:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BE745160B57; Thu, 2 Feb 2017 20:40:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 132AF160B44 for ; Thu, 2 Feb 2017 21:40:18 +0100 (CET) Received: (qmail 33446 invoked by uid 500); 2 Feb 2017 20:40:18 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 33435 invoked by uid 99); 2 Feb 2017 20:40:18 -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; Thu, 02 Feb 2017 20:40:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1F0E9DFC47; Thu, 2 Feb 2017 20:40:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: epayne@apache.org To: common-commits@hadoop.apache.org Message-Id: <5b348515abed4ffa98b7fc9e65eec7e4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-9300. TestDirectoryScanner.testThrottle() is still a little flakey. Contributed by Daniel Templeton. Date: Thu, 2 Feb 2017 20:40:18 +0000 (UTC) archived-at: Thu, 02 Feb 2017 20:40:19 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2.8 4f135647f -> 4e423edd9 HDFS-9300. TestDirectoryScanner.testThrottle() is still a little flakey. Contributed by Daniel Templeton. (cherry picked from commit 3c0adac88c3cddb821a732aea02bc068cafd7ea8) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4e423edd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4e423edd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4e423edd Branch: refs/heads/branch-2.8 Commit: 4e423edd95c73e868052458633be779952e3c238 Parents: 4f13564 Author: Eric Payne Authored: Thu Feb 2 15:34:59 2017 -0500 Committer: Eric Payne Committed: Thu Feb 2 15:34:59 2017 -0500 ---------------------------------------------------------------------- .../apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4e423edd/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 771d482..01cc192 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 @@ -602,7 +602,7 @@ public class TestDirectoryScanner { ratio = 0.0f; retries = maxRetries; - while ((retries > 0) && ((ratio < 3f) || (ratio > 4.5f))) { + while ((retries > 0) && ((ratio < 2.75f) || (ratio > 4.5f))) { scanner = new DirectoryScanner(dataNode, fds, conf); ratio = runThrottleTest(blocks); retries -= 1; @@ -611,7 +611,7 @@ public class TestDirectoryScanner { // Waiting should be about 4x running. LOG.info("RATIO: " + ratio); assertTrue("Throttle is too restrictive", ratio <= 4.5f); - assertTrue("Throttle is too permissive", ratio >= 3.0f); + assertTrue("Throttle is too permissive", ratio >= 2.75f); // Test with more than 1 thread conf.setInt(DFSConfigKeys.DFS_DATANODE_DIRECTORYSCAN_THREADS_KEY, 3); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org