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 zj...@apache.org on 2015/06/30 01:30:50 UTC
[34/50] [abbrv] hadoop git commit: HDFS-8665. Fix replication check
in DFSTestUtils#waitForReplication.
HDFS-8665. Fix replication check in DFSTestUtils#waitForReplication.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9456c835
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9456c835
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9456c835
Branch: refs/heads/YARN-2928
Commit: 9456c835eead4e3998e810d6d3a7bd86f78228b0
Parents: aac3d46
Author: Andrew Wang <wa...@apache.org>
Authored: Thu Jun 25 17:29:24 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Mon Jun 29 10:28:26 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/9456c835/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 01bb92d..dcedb9f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -672,6 +672,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/9456c835/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 96fb669..89ee674 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
@@ -535,7 +535,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;