You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by ss...@apache.org on 2013/02/28 23:17:39 UTC
svn commit: r1451391 - in /hadoop/common/trunk/hadoop-yarn-project:
CHANGES.txt
hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java
Author: sseth
Date: Thu Feb 28 22:17:39 2013
New Revision: 1451391
URL: http://svn.apache.org/r1451391
Log:
YARN-406. Fix TestRackResolver to function in networks where "host1" resolves to a valid host. Contributed by Hitesh Shah.
Modified:
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1451391&r1=1451390&r2=1451391&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Thu Feb 28 22:17:39 2013
@@ -44,6 +44,9 @@ Release 2.0.4-beta - UNRELEASED
YARN-390. ApplicationCLI and NodeCLI hard-coded platform-specific line
separator causes test failures on Windows. (Chris Nauroth via suresh)
+ YARN-406. Fix TestRackResolver to function in networks where "host1"
+ resolves to a valid host. (Hitesh Shah via sseth)
+
Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java?rev=1451391&r1=1451390&r2=1451391&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestRackResolver.java Thu Feb 28 22:17:39 2013
@@ -18,9 +18,13 @@
package org.apache.hadoop.yarn.util;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.net.DNSToSwitchMapping;
@@ -30,9 +34,12 @@ import org.junit.Test;
public class TestRackResolver {
+ private static Log LOG = LogFactory.getLog(TestRackResolver.class);
+
public static final class MyResolver implements DNSToSwitchMapping {
int numHost1 = 0;
+ public static String resolvedHost1 = "host1";
@Override
public List<String> resolve(List<String> hostList) {
@@ -43,7 +50,10 @@ public class TestRackResolver {
if (hostList.isEmpty()) {
return returnList;
}
- if (hostList.get(0).equals("host1")) {
+ LOG.info("Received resolve request for "
+ + hostList.get(0));
+ if (hostList.get(0).equals("host1")
+ || hostList.get(0).equals(resolvedHost1)) {
numHost1++;
returnList.add("/rack1");
}
@@ -62,6 +72,12 @@ public class TestRackResolver {
CommonConfigurationKeysPublic.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY,
MyResolver.class, DNSToSwitchMapping.class);
RackResolver.init(conf);
+ try {
+ InetAddress iaddr = InetAddress.getByName("host1");
+ MyResolver.resolvedHost1 = iaddr.getHostAddress();
+ } catch (UnknownHostException e) {
+ // Ignore if not found
+ }
Node node = RackResolver.resolve("host1");
Assert.assertEquals("/rack1", node.getNetworkLocation());
node = RackResolver.resolve("host1");