Repository: hadoop Updated Branches: refs/heads/branch-2.8 59b0661c7 -> f3dbabb13
HDFS-9772. TestBlockReplacement#testThrottler doesn't work as expected. Contributed by Lin Yiqun. (cherry picked from commit 903428bf946827b4d58c7c577ed0c574a7cff029) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f3dbabb1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f3dbabb1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f3dbabb1 Branch: refs/heads/branch-2.8 Commit: f3dbabb13a7e6176ccf24accebc0fc01325b6796 Parents: 59b0661 Author: Walter Su <waltersu4...@apache.org> Authored: Wed Apr 13 17:49:45 2016 +0800 Committer: Walter Su <waltersu4...@apache.org> Committed: Wed Apr 13 17:50:47 2016 +0800 ---------------------------------------------------------------------- .../apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3dbabb1/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java index 286a180..597dc46 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java @@ -81,7 +81,6 @@ public class TestBlockReplacement { long bytesToSend = TOTAL_BYTES; long start = Time.monotonicNow(); DataTransferThrottler throttler = new DataTransferThrottler(bandwidthPerSec); - long totalBytes = 0L; long bytesSent = 1024*512L; // 0.5MB throttler.throttle(bytesSent); bytesToSend -= bytesSent; @@ -93,7 +92,7 @@ public class TestBlockReplacement { } catch (InterruptedException ignored) {} throttler.throttle(bytesToSend); long end = Time.monotonicNow(); - assertTrue(totalBytes*1000/(end-start)<=bandwidthPerSec); + assertTrue(TOTAL_BYTES * 1000 / (end - start) <= bandwidthPerSec); } @Test