Repository: hadoop Updated Branches: refs/heads/branch-2.7 63b2019ab -> e768f8b77
HDFS-9865. TestBlockReplacement fails intermittently in trunk (Lin Yiqun via iwasakims) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e768f8b7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e768f8b7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e768f8b7 Branch: refs/heads/branch-2.7 Commit: e768f8b7719d6d969df717a7a390a3e9e8c061f0 Parents: 63b2019 Author: Masatake Iwasaki <[email protected]> Authored: Tue Mar 8 02:13:50 2016 +0900 Committer: Masatake Iwasaki <[email protected]> Committed: Tue Mar 8 02:13:50 2016 +0900 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../server/datanode/TestBlockReplacement.java | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e768f8b7/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 a26a530..9878c90 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -135,6 +135,9 @@ Release 2.7.3 - UNRELEASED HDFS-9851. NameNode throws NPE when setPermission is called on a path that does not exist. (Brahma Reddy Battula via aajisaka) + HDFS-9865. TestBlockReplacement fails intermittently in trunk + (Lin Yiqun via iwasakims) + Release 2.7.2 - 2016-01-25 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/e768f8b7/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java index 70c2a4e..bf0f96c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java @@ -410,11 +410,19 @@ public class TestBlockReplacement { (DatanodeInfo)sourceDnDesc, (DatanodeInfo)sourceDnDesc, (DatanodeInfo)destDnDesc)); // Waiting for the FsDatasetAsyncDsikService to delete the block - Thread.sleep(3000); - // Triggering the incremental block report to report the deleted block to - // namnemode - cluster.getDataNodes().get(0).triggerBlockReport( - new BlockReportOptions.Factory().setIncremental(true).build()); + for (int tries = 0; tries < 20; tries++) { + Thread.sleep(1000); + // Triggering the deletion block report to report the deleted block + // to namnemode + DataNodeTestUtils.triggerDeletionReport(cluster.getDataNodes().get(0)); + locatedBlocks = + client.getNamenode().getBlockLocations("/tmp.txt", 0, 10L) + .getLocatedBlocks(); + // If block was deleted and only on 1 datanode then break out + if (locatedBlocks.get(0).getLocations().length == 1) { + break; + } + } cluster.transitionToStandby(0); cluster.transitionToActive(1);
