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 jl...@apache.org on 2016/06/07 15:37:41 UTC
hadoop git commit: HDFS-9580.
TestComputeInvalidateWork#testDatanodeReRegistration failed due to unexpected
number of invalidate blocks. Contributed by Wei-Chiu Chuang.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 b8c1db6f6 -> 5b4c80b27
HDFS-9580. TestComputeInvalidateWork#testDatanodeReRegistration failed due to unexpected number of invalidate blocks. Contributed by Wei-Chiu Chuang.
Change-Id: I9411dfb1dd4605cbcc515ca3361218d35d7c5fe3
(cherry picked from commit 0087734cc1e18e029ea39f06ca25c8a7d60af004)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5b4c80b2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5b4c80b2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5b4c80b2
Branch: refs/heads/branch-2
Commit: 5b4c80b27eb8e6cbc9ba7176860dff5982ea8657
Parents: b8c1db6
Author: Jason Lowe <jl...@apache.org>
Authored: Tue Jun 7 15:33:43 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Tue Jun 7 15:33:43 2016 +0000
----------------------------------------------------------------------
.../hdfs/server/blockmanagement/TestComputeInvalidateWork.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b4c80b2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java
index 3fcca81..033f4d1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java
@@ -146,6 +146,7 @@ public class TestComputeInvalidateWork {
// Create a file and shutdown the DNs, which populates InvalidateBlocks
DFSTestUtil.createFile(dfs, path, dfs.getDefaultBlockSize(),
(short) NUM_OF_DATANODES, 0xED0ED0);
+ DFSTestUtil.waitForReplication(dfs, path, (short) NUM_OF_DATANODES, 12000);
for (DataNode dn : cluster.getDataNodes()) {
dn.shutdown();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org