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 cn...@apache.org on 2014/11/07 07:53:43 UTC
hadoop git commit: HDFS-7221. TestDNFencingWithReplication fails
consistently. Contributed by Charles Lamb.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.6 8c3a0d5a9 -> a2b46a734
HDFS-7221. TestDNFencingWithReplication fails consistently. Contributed by Charles Lamb.
(cherry picked from commit ac56b0637e55465d3b7f7719c8689bff2a572dc0)
(cherry picked from commit 2d0996ae6d6bdfa01cff790f5ed7198d791de62b)
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/a2b46a73
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a2b46a73
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a2b46a73
Branch: refs/heads/branch-2.6
Commit: a2b46a73404ec1a21c24ecd46b7ed41d52b432ee
Parents: 8c3a0d5
Author: Andrew Wang <wa...@apache.org>
Authored: Tue Oct 21 12:55:18 2014 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Thu Nov 6 22:49:28 2014 -0800
----------------------------------------------------------------------
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/a2b46a73/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 87825b5..e5d667c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -306,6 +306,8 @@ Release 2.6.0 - UNRELEASED
HDFS-7233. NN logs unnecessary org.apache.hadoop.hdfs.protocol.UnresolvedPathException.
(Rushabh S Shah via jing9)
+ HDFS-7221. TestDNFencingWithReplication fails consistently. (Charles Lamb via wang)
+
OPTIMIZATIONS
HDFS-6690. Deduplicate xattr names in memory. (wang)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2b46a73/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);
}
/**