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 <[email protected]> Authored: Thu Feb 2 15:34:59 2017 -0500 Committer: Eric Payne <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
