HDFS-10590: Fix TestReconstructStripedBlocks.testCountLiveReplicas test failures. Contributed by Rakesh R
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/438b7c59 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/438b7c59 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/438b7c59 Branch: refs/heads/YARN-2915 Commit: 438b7c5935f4314fd37916aee4369e67ec2887f8 Parents: 087290e Author: Uma Maheswara Rao G <[email protected]> Authored: Wed Jul 13 00:07:11 2016 -0700 Committer: Uma Maheswara Rao G <[email protected]> Committed: Wed Jul 13 00:07:11 2016 -0700 ---------------------------------------------------------------------- .../src/test/java/org/apache/hadoop/hdfs/StripedFileTestUtil.java | 2 ++ .../hadoop/hdfs/server/namenode/TestReconstructStripedBlocks.java | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/438b7c59/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/StripedFileTestUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/StripedFileTestUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/StripedFileTestUtil.java index 4c3afdd..0b036fd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/StripedFileTestUtil.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/StripedFileTestUtil.java @@ -514,6 +514,8 @@ public class StripedFileTestUtil { public static LocatedBlocks waitForReconstructionFinished(Path file, DistributedFileSystem fs, int groupSize) throws Exception { + LOG.info("Waiting for reconstruction to be finished for the file:" + file + + ", groupSize:" + groupSize); final int attempts = 60; for (int i = 0; i < attempts; i++) { LocatedBlocks locatedBlocks = getLocatedBlocks(file, fs); http://git-wip-us.apache.org/repos/asf/hadoop/blob/438b7c59/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReconstructStripedBlocks.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReconstructStripedBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReconstructStripedBlocks.java index 6069924..c38b6b4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReconstructStripedBlocks.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestReconstructStripedBlocks.java @@ -303,6 +303,8 @@ public class TestReconstructStripedBlocks { // check if NN can detect the missing internal block and finish the // reconstruction + StripedFileTestUtil.waitForReconstructionFinished(filePath, fs, + GROUP_SIZE); boolean reconstructed = false; for (int i = 0; i < 5; i++) { NumberReplicas num = null; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
