HDFS-13945. TestDataNodeVolumeFailure is Flaky. Contributed by Ayush Saxena.

(cherry picked from commit 6e0e6daaf3215213c32cdffa79f3730d40e981ea)
2018-10-12 17:34:10 +05:30 · 2018-10-12 17:34:10 +05:30 · bed2f407a9
commit bed2f407a9
parent f1fbc56371
1 changed files with 2 additions and 4 deletions
--- 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 void testUnderReplicationAfterVolFailure() throws Exception {
      @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;
        }