Author: suresh
Date: Thu Mar 8 01:49:29 2012
New Revision: 1298251
URL: http://svn.apache.org/viewvc?rev=1298251&view=rev
Log:
HDFS-3036. Merge r1295961 from trunk to 0.23
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1298251&r1=1298250&r2=1298251&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Mar 8 01:49:29 2012
@@ -133,6 +133,8 @@ Release 0.23.3 - UNRELEASED
over-replicated, and invalidated blocks.
(Tomasz Nykiel via todd)
+ HDFS-3036. Remove unused method DFSUtil#isDefaultNamenodeAddress. (atm)
+
BUG FIXES
HDFS-2481. Unknown protocol:
org.apache.hadoop.hdfs.protocol.ClientProtocol.
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java?rev=1298251&r1=1298250&r2=1298251&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
Thu Mar 8 01:49:29 2012
@@ -455,8 +455,7 @@ public class DFSUtil {
* namenode, this method returns the corresponding nameservice ID,
* by doing a reverse lookup on the list of nameservices until it
* finds a match.
- * If null is returned, client should try {@link #isDefaultNamenodeAddress}
- * to check pre-Federated configurations.
+ *
* Since the process of resolving URIs to Addresses is slightly expensive,
* this utility method should not be used in performance-critical routines.
*
@@ -479,7 +478,6 @@ public class DFSUtil {
// Configuration with a single namenode and no nameserviceId
if (nameserviceIds == null || nameserviceIds.isEmpty()) {
- // client should try {@link isDefaultNamenodeAddress} instead
return null;
}
// Get the candidateAddresses for all the configured nameServiceIds
@@ -493,7 +491,6 @@ public class DFSUtil {
}
}
// didn't find a match
- // client should try {@link isDefaultNamenodeAddress} instead
return null;
}
@@ -537,38 +534,6 @@ public class DFSUtil {
}
/**
- * Given the InetSocketAddress for any configured communication with a
- * namenode, this method determines whether it is the configured
- * communication channel for the "default" namenode.
- * It does a reverse lookup on the list of default communication parameters
- * to see if the given address matches any of them.
- * Since the process of resolving URIs to Addresses is slightly expensive,
- * this utility method should not be used in performance-critical routines.
- *
- * @param conf - configuration
- * @param address - InetSocketAddress for configured communication with NN.
- * Configured addresses are typically given as URIs, but we may have to
- * compare against a URI typed in by a human, or the server name may be
- * aliased, so we compare unambiguous InetSocketAddresses instead of just
- * comparing URI substrings.
- * @param keys - list of configured communication parameters that should
- * be checked for matches. For example, to compare against RPC
addresses,
- * provide the list DFS_NAMENODE_SERVICE_RPC_ADDRESS_KEY,
- * DFS_NAMENODE_RPC_ADDRESS_KEY
- * @return - boolean confirmation if matched generic parameter
- */
- public static boolean isDefaultNamenodeAddress(Configuration conf,
- InetSocketAddress address, String... keys) {
- for (String key : keys) {
- String candidateAddress = conf.get(key);
- if (candidateAddress != null
- && address.equals(NetUtils.createSocketAddr(candidateAddress)))
- return true;
- }
- return false;
- }
-
- /**
* @return key specific to a nameserviceId from a generic key
*/
public static String getNameServiceIdKey(String key, String nameserviceId) {
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java?rev=1298251&r1=1298250&r2=1298251&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
Thu Mar 8 01:49:29 2012
@@ -208,27 +208,6 @@ public class TestDFSUtil {
assertEquals(expectedNameServiceId, nameserviceId);
}
- /**
- * Test for
- * {@link DFSUtil#isDefaultNamenodeAddress(Configuration, InetSocketAddress,
String...)}
- */
- @Test
- public void testSingleNamenode() {
- HdfsConfiguration conf = new HdfsConfiguration();
- final String DEFAULT_ADDRESS = "localhost:9000";
- final String NN2_ADDRESS = "localhost:9001";
- conf.set(DFS_NAMENODE_RPC_ADDRESS_KEY, DEFAULT_ADDRESS);
-
- InetSocketAddress testAddress1 =
NetUtils.createSocketAddr(DEFAULT_ADDRESS);
- boolean isDefault = DFSUtil.isDefaultNamenodeAddress(conf, testAddress1,
- DFS_NAMENODE_SERVICE_RPC_ADDRESS_KEY, DFS_NAMENODE_RPC_ADDRESS_KEY);
- assertTrue(isDefault);
- InetSocketAddress testAddress2 = NetUtils.createSocketAddr(NN2_ADDRESS);
- isDefault = DFSUtil.isDefaultNamenodeAddress(conf, testAddress2,
- DFS_NAMENODE_SERVICE_RPC_ADDRESS_KEY, DFS_NAMENODE_RPC_ADDRESS_KEY);
- assertFalse(isDefault);
- }
-
/** Tests to ensure default namenode is used as fallback */
@Test
public void testDefaultNamenode() throws IOException {
