Repository: hadoop Updated Branches: refs/heads/branch-2 613c7088f -> ad1f0f307
HDFS-9176. Fix TestDirectoryScanner#testThrottling often fails. (Daniel Templeton via lei) (cherry picked from commit 6dd47d754cb11297c8710a5c318c034abea7a836) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ad1f0f30 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ad1f0f30 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ad1f0f30 Branch: refs/heads/branch-2 Commit: ad1f0f307b4df5c868c34e297648ff10ee5885d8 Parents: 613c708 Author: Lei Xu <[email protected]> Authored: Wed Oct 7 14:33:43 2015 -0700 Committer: Lei Xu <[email protected]> Committed: Wed Oct 7 14:34:18 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hdfs/server/datanode/TestDirectoryScanner.java | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ad1f0f30/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 841b02e..44ce313 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1163,6 +1163,9 @@ Release 2.8.0 - UNRELEASED HDFS-9159. [OIV] : return value of the command is not correct if invalid value specified in "-p (processor)" option (nijel via vinayakumarb) + HDFS-9176. Fix TestDirectoryScanner#testThrottling often fails. + (Daniel Templeton via lei) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/ad1f0f30/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 a386079..623d3ee 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 @@ -665,17 +665,24 @@ public class TestDirectoryScanner { interruptor.schedule(new Runnable() { @Override public void run() { - scanner.shutdown(); nowMs.set(Time.monotonicNow()); + scanner.shutdown(); } }, 2L, TimeUnit.SECONDS); scanner.reconcile(); assertFalse(scanner.getRunStatus()); - LOG.info("Scanner took " + (Time.monotonicNow() - nowMs.get()) - + "ms to shutdown"); - assertTrue("Scanner took too long to shutdown", - Time.monotonicNow() - nowMs.get() < 1000L); + + long finalMs = nowMs.get(); + + // If the scan didn't complete before the shutdown was run, check + // that the shutdown was timely + if (finalMs > 0) { + LOG.info("Scanner took " + (Time.monotonicNow() - finalMs) + + "ms to shutdown"); + assertTrue("Scanner took too long to shutdown", + Time.monotonicNow() - finalMs < 1000L); + } ratio = (float)scanner.timeWaitingMs.get() / scanner.timeRunningMs.get();
