You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by su...@apache.org on 2013/05/24 21:16:59 UTC
svn commit: r1486176 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs:
CHANGES.txt src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java
Author: suresh
Date: Fri May 24 19:16:58 2013
New Revision: 1486176
URL: http://svn.apache.org/r1486176
Log:
HDFS-4722. Merge r1476597 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1486176&r1=1486175&r2=1486176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri May 24 19:16:58 2013
@@ -394,6 +394,9 @@ Release 2.0.5-beta - UNRELEASED
HDFS-4740. Fixes for a few test failures on Windows.
(Arpit Agarwal via suresh)
+ HDFS-4722. TestGetConf#testFederation times out on Windows.
+ (Ivan Mitic via suresh)
+
Release 2.0.4-alpha - 2013-04-25
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java?rev=1486176&r1=1486175&r2=1486176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java Fri May 24 19:16:58 2013
@@ -87,6 +87,16 @@ public class TestGetConf {
return values;
}
+ /**
+ * Add namenodes to the static resolution list to avoid going
+ * through DNS which can be really slow in some configurations.
+ */
+ private void setupStaticHostResolution(int nameServiceIdCount) {
+ for (int i = 0; i < nameServiceIdCount; i++) {
+ NetUtils.addStaticResolution("nn" + i, "localhost");
+ }
+ }
+
/*
* Convert the map returned from DFSUtil functions to an array of
* addresses represented as "host:port"
@@ -306,6 +316,7 @@ public class TestGetConf {
String[] nnAddresses = setupAddress(conf,
DFS_NAMENODE_SERVICE_RPC_ADDRESS_KEY, nsCount, 1000);
setupAddress(conf, DFS_NAMENODE_RPC_ADDRESS_KEY, nsCount, 1500);
+ setupStaticHostResolution(nsCount);
String[] backupAddresses = setupAddress(conf,
DFS_NAMENODE_BACKUP_ADDRESS_KEY, nsCount, 2000);
String[] secondaryAddresses = setupAddress(conf,