Browse Source

Revert "HDFS-9423. Fix intermittent failure of TestEditLogTailer. Contributed by Masatake Iwasaki."

This reverts commit de3b33e121a685e2b27576ef8e8c2187c5065a5f.
Steve Loughran 9 years ago
parent
commit
331ed6998b

+ 0 - 3
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

+ 0 - 2
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()