Repository: hadoop Updated Branches: refs/heads/branch-2 de3b33e12 -> 331ed6998
Revert "HDFS-9423. Fix intermittent failure of TestEditLogTailer. Contributed by Masatake Iwasaki." This reverts commit de3b33e121a685e2b27576ef8e8c2187c5065a5f. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/331ed699 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/331ed699 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/331ed699 Branch: refs/heads/branch-2 Commit: 331ed6998b30abf47e6f8d776980cc87e1cc3da2 Parents: de3b33e Author: Steve Loughran <ste...@apache.org> Authored: Mon Nov 23 12:28:25 2015 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Mon Nov 23 12:28:25 2015 +0000 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 --- .../apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java | 2 -- 2 files changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/331ed699/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 dd65421..3b4f3b0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1504,9 +1504,6 @@ Release 2.8.0 - UNRELEASED HDFS-9435. TestBlockRecovery#testRBWReplicas is failing intermittently. (Rakesh R via waltersu4549) - HDFS-9423. Fix intermittent failure of TestEditLogTailer. - (Masatake Iwasaki via waltersu4549) - Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/331ed699/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java index b307560..d486920 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestEditLogTailer.java @@ -60,7 +60,6 @@ public class TestEditLogTailer { ServiceFailedException { Configuration conf = new HdfsConfiguration(); conf.setInt(DFSConfigKeys.DFS_HA_TAILEDITS_PERIOD_KEY, 1); - conf.setInt(DFSConfigKeys.DFS_HA_TAILEDITS_ALL_NAMESNODES_RETRY_KEY, 100); HAUtil.setAllowStandbyReads(conf, true); @@ -121,7 +120,6 @@ public class TestEditLogTailer { // Roll every 1s conf.setInt(DFSConfigKeys.DFS_HA_LOGROLL_PERIOD_KEY, 1); conf.setInt(DFSConfigKeys.DFS_HA_TAILEDITS_PERIOD_KEY, 1); - conf.setInt(DFSConfigKeys.DFS_HA_TAILEDITS_ALL_NAMESNODES_RETRY_KEY, 100); // Have to specify IPC ports so the NNs can talk to each other. MiniDFSNNTopology topology = new MiniDFSNNTopology()
