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 ar...@apache.org on 2016/01/12 05:32:02 UTC
[03/23] hadoop git commit: HDFS-9626.
TestBlockReplacement#testBlockReplacement fails occasionally. Contributed by
Xiao Chen.
HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally. Contributed by Xiao Chen.
Change-Id: Ia766a5bfb89f8cf8a48b473bb27c30d5818ebfc0
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0af2022e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0af2022e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0af2022e
Branch: refs/heads/HDFS-1312
Commit: 0af2022e6d431e746301086980134730d4287cc7
Parents: 38c4c14
Author: Zhe Zhang <zh...@apache.org>
Authored: Fri Jan 8 13:14:36 2016 -0800
Committer: Zhe Zhang <zh...@apache.org>
Committed: Fri Jan 8 13:14:36 2016 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hadoop/hdfs/server/datanode/TestBlockReplacement.java | 7 ++++---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0af2022e/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 887ddef..64cab74 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -406,6 +406,9 @@ Trunk (Unreleased)
HDFS-9615. Fix variable name typo in DFSConfigKeys. (Ray Chiang via
Arpit Agarwal)
+ HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally.
+ (Xiao Chen via zhz)
+
BREAKDOWN OF HDFS-7285 SUBTASKS AND RELATED JIRAS
HDFS-7347. Configurable erasure coding policy for individual files and
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0af2022e/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 d2bf734..bfd02e2 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
@@ -198,9 +198,10 @@ public class TestBlockReplacement {
LOG.info("Testcase 4: invalid del hint " + proxies.get(0) );
assertTrue(replaceBlock(b, proxies.get(0), proxies.get(1), source));
// after cluster has time to resolve the over-replication,
- // block locations should contain two proxies,
- // and either source or newNode, but not both.
- checkBlocks(proxies.toArray(new DatanodeInfo[proxies.size()]),
+ // block locations should contain any 3 of the blocks, since after the
+ // deletion the number of racks is still >=2 for sure.
+ // See HDFS-9314 for details, espacially the comment on 18/Nov/15 14:09.
+ checkBlocks(new DatanodeInfo[]{},
fileName.toString(),
DEFAULT_BLOCK_SIZE, REPLICATION_FACTOR, client);
} finally {