Repository: hadoop Updated Branches: refs/heads/branch-3.1 f1fbc5637 -> bed2f407a
HDFS-13945. TestDataNodeVolumeFailure is Flaky. Contributed by Ayush Saxena. (cherry picked from commit 6e0e6daaf3215213c32cdffa79f3730d40e981ea) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bed2f407 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bed2f407 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bed2f407 Branch: refs/heads/branch-3.1 Commit: bed2f407a91e6be70aaedaaaa6f06f575c19d94c Parents: f1fbc56 Author: Vinayakumar B <vinayakum...@apache.org> Authored: Fri Oct 12 17:34:10 2018 +0530 Committer: Vinayakumar B <vinayakum...@apache.org> Committed: Fri Oct 12 17:36:03 2018 +0530 ---------------------------------------------------------------------- .../hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bed2f407/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java index 16c0cfa..7d04942 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java @@ -424,10 +424,8 @@ public class TestDataNodeVolumeFailure { @Override public Boolean get() { // underReplicatedBlocks are due to failed volumes - int underReplicatedBlocks = BlockManagerTestUtil - .checkHeartbeatAndGetUnderReplicatedBlocksCount( - cluster.getNamesystem(), bm); - + long underReplicatedBlocks = bm.getLowRedundancyBlocksCount() + + bm.getPendingReconstructionBlocksCount(); if (underReplicatedBlocks > 0) { return true; } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
