hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject hadoop git commit: HDFS-9300. TestDirectoryScanner.testThrottle() is still a little flakey. Contributed by Daniel Templeton.
Date Thu, 17 Dec 2015 00:21:20 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk d4e766de9 -> 3c0adac88


HDFS-9300. TestDirectoryScanner.testThrottle() is still a little flakey. Contributed by Daniel
Templeton.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3c0adac8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3c0adac8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3c0adac8

Branch: refs/heads/trunk
Commit: 3c0adac88c3cddb821a732aea02bc068cafd7ea8
Parents: d4e766d
Author: Andrew Wang <wang@apache.org>
Authored: Wed Dec 16 16:21:06 2015 -0800
Committer: Andrew Wang <wang@apache.org>
Committed: Wed Dec 16 16:21:06 2015 -0800

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                      | 3 +++
 .../apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c0adac8/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 69fa302..2d7d170 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -901,6 +901,9 @@ Release 2.9.0 - UNRELEASED
 
     HDFS-9371. Code cleanup for DatanodeManager. (jing9)
 
+    HDFS-9300. TestDirectoryScanner.testThrottle() is still a little flakey.
+    (Daniel Templeton via wang)
+
   OPTIMIZATIONS
 
   BUG FIXES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/3c0adac8/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 250e07d..d030144 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
@@ -601,7 +601,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;
@@ -610,7 +610,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);


Mime
View raw message