Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

(cherry picked from commit 3c0adac88c)
This commit is contained in:
Andrew Wang 2015-12-16 16:21:06 -08:00
parent 5891d6ed55
commit c7cb29defe
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -28,6 +28,9 @@ Release 2.9.0 - UNRELEASED
HDFS-9371. Code cleanup for DatanodeManager. (jing9) HDFS-9371. Code cleanup for DatanodeManager. (jing9)
HDFS-9300. TestDirectoryScanner.testThrottle() is still a little flakey.
(Daniel Templeton via wang)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java
View File

@ -601,7 +601,7 @@ public class TestDirectoryScanner {
ratio = 0.0f; ratio = 0.0f;
retries = maxRetries; 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); scanner = new DirectoryScanner(dataNode, fds, conf);
ratio = runThrottleTest(blocks); ratio = runThrottleTest(blocks);
retries -= 1; retries -= 1;
@ -610,7 +610,7 @@ public class TestDirectoryScanner {
// Waiting should be about 4x running. // Waiting should be about 4x running.
LOG.info("RATIO: " + ratio); LOG.info("RATIO: " + ratio);
assertTrue("Throttle is too restrictive", ratio <= 4.5f); 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 // Test with more than 1 thread
conf.setInt(DFSConfigKeys.DFS_DATANODE_DIRECTORYSCAN_THREADS_KEY, 3); conf.setInt(DFSConfigKeys.DFS_DATANODE_DIRECTORYSCAN_THREADS_KEY, 3);