Repository: hadoop Updated Branches: refs/heads/branch-2 a06613427 -> 2d0996ae6
HDFS-7221. TestDNFencingWithReplication fails consistently. Contributed by Charles Lamb. (cherry picked from commit ac56b0637e55465d3b7f7719c8689bff2a572dc0) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2d0996ae Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2d0996ae Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2d0996ae Branch: refs/heads/branch-2 Commit: 2d0996ae6d6bdfa01cff790f5ed7198d791de62b Parents: a066134 Author: Andrew Wang <[email protected]> Authored: Tue Oct 21 12:55:18 2014 -0700 Committer: Andrew Wang <[email protected]> Committed: Tue Oct 21 12:55:48 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../hadoop/hdfs/server/namenode/ha/HAStressTestHarness.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d0996ae/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 3cee2e8..255fd61 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -26,6 +26,8 @@ Release 2.7.0 - UNRELEASED HDFS-7266. HDFS Peercache enabled check should not lock on object (awang via cmccabe) + HDFS-7221. TestDNFencingWithReplication fails consistently. (Charles Lamb via wang) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/2d0996ae/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/HAStressTestHarness.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/HAStressTestHarness.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/HAStressTestHarness.java index 048e921..5b72901 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/HAStressTestHarness.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/HAStressTestHarness.java @@ -49,7 +49,9 @@ public class HAStressTestHarness { conf.setInt(DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, 1); conf.setInt(DFSConfigKeys.DFS_HA_TAILEDITS_PERIOD_KEY, 1); // Increase max streams so that we re-replicate quickly. - conf.setInt(DFSConfigKeys.DFS_NAMENODE_REPLICATION_MAX_STREAMS_KEY, 1000); + conf.setInt(DFSConfigKeys.DFS_NAMENODE_REPLICATION_MAX_STREAMS_KEY, 16); + conf.setInt( + DFSConfigKeys.DFS_NAMENODE_REPLICATION_STREAMS_HARD_LIMIT_KEY, 16); } /**
