Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3C852181F2 for ; Fri, 26 Jun 2015 00:29:39 +0000 (UTC) Received: (qmail 41462 invoked by uid 500); 26 Jun 2015 00:29:39 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 41399 invoked by uid 500); 26 Jun 2015 00:29:39 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 41390 invoked by uid 99); 26 Jun 2015 00:29:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Jun 2015 00:29:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D5312E369A; Fri, 26 Jun 2015 00:29:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wang@apache.org To: common-commits@hadoop.apache.org Message-Id: <3b3086a1b587487f90951b89a8a63127@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-8665. Fix replication check in DFSTestUtils#waitForReplication. Date: Fri, 26 Jun 2015 00:29:38 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 31fd7a51d -> ba406b723 HDFS-8665. Fix replication check in DFSTestUtils#waitForReplication. (cherry picked from commit ff0e5e572f5dcf7b49381cbe901360f6e171d423) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ba406b72 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ba406b72 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ba406b72 Branch: refs/heads/branch-2 Commit: ba406b723d4b978d2dd02f35a2a8e20a812a3cee Parents: 31fd7a5 Author: Andrew Wang Authored: Thu Jun 25 17:29:24 2015 -0700 Committer: Andrew Wang Committed: Thu Jun 25 17:29:30 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba406b72/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 8e439b0..e423c6d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -336,6 +336,8 @@ Release 2.8.0 - UNRELEASED HDFS-8640. Make reserved RBW space visible through JMX. (kanaka kumar avvaru via Arpit Agarwal) + HDFS-8665. Fix replication check in DFSTestUtils#waitForReplication. (wang) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba406b72/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java index 009babf..c079691 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java @@ -549,7 +549,14 @@ public class DFSTestUtil { public Boolean get() { try { FileStatus stat = dfs.getFileStatus(file); - return replication == stat.getReplication(); + BlockLocation[] locs = dfs.getFileBlockLocations(stat, 0, stat + .getLen()); + for (BlockLocation loc : locs) { + if (replication != loc.getHosts().length) { + return false; + } + } + return true; } catch (IOException e) { LOG.info("getFileStatus on path " + file + " failed!", e); return false;