You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2018/10/12 12:05:34 UTC

[1/2] hadoop git commit: HDFS-13945. TestDataNodeVolumeFailure is Flaky. Contributed by Ayush Saxena.

Repository: hadoop
Updated Branches:
  refs/heads/branch-3.2 d838d39a2 -> b185964b1
  refs/heads/trunk de44e1064 -> 6e0e6daaf


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6e0e6daa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6e0e6daa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6e0e6daa

Branch: refs/heads/trunk
Commit: 6e0e6daaf3215213c32cdffa79f3730d40e981ea
Parents: de44e10
Author: Vinayakumar B <vi...@apache.org>
Authored: Fri Oct 12 17:34:10 2018 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Fri Oct 12 17:34:10 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/6e0e6daa/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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org

[2/2] hadoop git commit: HDFS-13945. TestDataNodeVolumeFailure is Flaky. Contributed by Ayush Saxena.

Posted by vi...@apache.org.
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/b185964b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b185964b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b185964b

Branch: refs/heads/branch-3.2
Commit: b185964b15329996e17ae43107afe3470e0b4231
Parents: d838d39
Author: Vinayakumar B <vi...@apache.org>
Authored: Fri Oct 12 17:34:10 2018 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Fri Oct 12 17:34:28 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/b185964b/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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org