Author: suresh
Date: Tue Jan 24 01:33:56 2012
New Revision: 1235108
URL: http://svn.apache.org/viewvc?rev=1235108&view=rev
Log:
HADOOP-7964. Merging change r1235107 from branch-1
Added:
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/security/NetUtilsTestResolver.java
- copied unchanged from r1235107,
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/security/NetUtilsTestResolver.java
Removed:
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/net/NetUtilsTestResolver.java
Modified:
hadoop/common/branches/branch-1.0/ (props changed)
hadoop/common/branches/branch-1.0/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/net/NetUtils.java
hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/security/SecurityUtil.java
hadoop/common/branches/branch-1.0/src/mapred/ (props changed)
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/fs/TestFileSystem.java
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/net/TestNetUtils.java
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/security/TestSecurityUtil.java
Propchange: hadoop/common/branches/branch-1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 24 01:33:56 2012
@@ -3,6 +3,6 @@
/hadoop/common/branches/branch-0.20-security:1170042,1170087,1170997,1171137,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1174471,1175114,1176179,1176720,1177907,1179036,1179171,1179519,1179857,1183086,1183101,1183176,1183556,1186509,1187141,1189029,1189361,1190079,1190089,1190100,1195737,1197330,1198906,1199401,1199571,1200733,1205148,1205655,1206180
/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
-/hadoop/common/branches/branch-1:1207579,1208143
+/hadoop/common/branches/branch-1:1207579,1208143,1235107
/hadoop/core/branches/branch-0.19:713112
/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1235108&r1=1235107&r2=1235108&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Tue Jan 24 01:33:56 2012
@@ -1,5 +1,16 @@
Hadoop Change Log
+Release 1.0.1 - unreleased
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ BUG FIXES
+
+ HADOOP-7964. Deadlock in NetUtils and SecurityUtil class initialization.
+ (Daryn Sharp via suresh)
+
Release 1.0.0 - 2011.11.27
NEW FEATURES
Propchange: hadoop/common/branches/branch-1.0/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 24 01:33:56 2012
@@ -3,7 +3,7 @@
/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1170087,1170997,1171137,1171181,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1173843,1174326,1174471,1174476,1174482,1175114,1176179,1176182,1176270,1176276,1176675,1176720,1177031,1177036,1177098,1177101,1177907,1178074,1179036,1179171,1179471,1179519,1179713,1179722,1179857,1179919,1183086,1183101,1183176,1183556,1186509,1187141,1189029,1189361,1190079,1190089,1190100,1195737,1197330,1198906,1199401,1199571,1200733,1205148,1205655,1206180
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1152887,1154413,1159730,1161741
-/hadoop/common/branches/branch-1/CHANGES.txt:1207579,1208143,1208936
+/hadoop/common/branches/branch-1/CHANGES.txt:1207579,1208143,1208936,1235107
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified:
hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/net/NetUtils.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/net/NetUtils.java?rev=1235108&r1=1235107&r2=1235108&view=diff
==============================================================================
---
hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/net/NetUtils.java
(original)
+++
hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/net/NetUtils.java
Tue Jan 24 01:33:56 2012
@@ -45,35 +45,12 @@ import org.apache.hadoop.ipc.VersionedPr
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.util.ReflectionUtils;
-// this will need to be replaced someday when there is a suitable replacement
-import sun.net.dns.ResolverConfiguration;
-import sun.net.util.IPAddressUtil;
-
public class NetUtils {
private static final Log LOG = LogFactory.getLog(NetUtils.class);
private static Map<String, String> hostToResolved =
new HashMap<String, String>();
- private static HostResolver hostResolver;
-
- static {
- // SecurityUtils requires a more secure host resolver if tokens are
- // using hostnames
- setUseQualifiedHostResolver(!SecurityUtil.getTokenServiceUseIp());
- }
-
- /**
- * This method is intended for use only by SecurityUtils!
- * @param flag where the qualified or standard host resolver is used
- * to create socket addresses
- */
- public static void setUseQualifiedHostResolver(boolean flag) {
- hostResolver = flag
- ? new QualifiedHostResolver()
- : new StandardHostResolver();
- }
-
/**
* Get the socket factory for the given class according to its
* configuration parameter
@@ -206,7 +183,7 @@ public class NetUtils {
InetSocketAddress addr;
try {
- InetAddress iaddr = hostResolver.getByName(resolveHost);
+ InetAddress iaddr = SecurityUtil.getByName(resolveHost);
// if there is a static entry for the host, make the returned
// address look like the original given host
if (staticHost != null) {
@@ -219,150 +196,6 @@ public class NetUtils {
return addr;
}
- protected interface HostResolver {
- InetAddress getByName(String host) throws UnknownHostException;
- }
-
- /**
- * Uses standard java host resolution
- */
- protected static class StandardHostResolver implements HostResolver {
- public InetAddress getByName(String host) throws UnknownHostException {
- return InetAddress.getByName(host);
- }
- }
-
- /**
- * This an alternate resolver with important properties that the standard
- * java resolver lacks:
- * 1) The hostname is fully qualified. This avoids security issues if not
- * all hosts in the cluster do not share the same search domains. It
- * also prevents other hosts from performing unnecessary dns searches.
- * In contrast, InetAddress simply returns the host as given.
- * 2) The InetAddress is instantiated with an exact host and IP to prevent
- * further unnecessary lookups. InetAddress may perform an unnecessary
- * reverse lookup for an IP.
- * 3) A call to getHostName() will always return the qualified hostname, or
- * more importantly, the IP if instantiated with an IP. This avoids
- * unnecessary dns timeouts if the host is not resolvable.
- * 4) Point 3 also ensures that if the host is re-resolved, ex. during a
- * connection re-attempt, that a reverse lookup to host and forward
- * lookup to IP is not performed since the reverse/forward mappings may
- * not always return the same IP. If the client initiated a connection
- * with an IP, then that IP is all that should ever be contacted.
- *
- * NOTE: this resolver is only used if:
- * hadoop.security.token.service.use_ip=false
- */
- protected static class QualifiedHostResolver implements HostResolver {
- @SuppressWarnings("unchecked")
- private List<String> searchDomains =
- ResolverConfiguration.open().searchlist();
-
- /**
- * Create an InetAddress with a fully qualified hostname of the given
- * hostname. InetAddress does not qualify an incomplete hostname that
- * is resolved via the domain search list.
- * {@link InetAddress#getCanonicalHostName()} will fully qualify the
- * hostname, but it always return the A record whereas the given hostname
- * may be a CNAME.
- *
- * @param host a hostname or ip address
- * @return InetAddress with the fully qualified hostname or ip
- * @throws UnknownHostException if host does not exist
- */
- public InetAddress getByName(String host) throws UnknownHostException {
- InetAddress addr = null;
-
- if (IPAddressUtil.isIPv4LiteralAddress(host)) {
- // use ipv4 address as-is
- byte[] ip = IPAddressUtil.textToNumericFormatV4(host);
- addr = InetAddress.getByAddress(host, ip);
- } else if (IPAddressUtil.isIPv6LiteralAddress(host)) {
- // use ipv6 address as-is
- byte[] ip = IPAddressUtil.textToNumericFormatV6(host);
- addr = InetAddress.getByAddress(host, ip);
- } else if (host.endsWith(".")) {
- // a rooted host ends with a dot, ex. "host."
- // rooted hosts never use the search path, so only try an exact lookup
- addr = getByExactName(host);
- } else if (host.contains(".")) {
- // the host contains a dot (domain), ex. "host.domain"
- // try an exact host lookup, then fallback to search list
- addr = getByExactName(host);
- if (addr == null) {
- addr = getByNameWithSearch(host);
- }
- } else {
- // it's a simple host with no dots, ex. "host"
- // try the search list, then fallback to exact host
- InetAddress loopback = InetAddress.getByName(null);
- if (host.equalsIgnoreCase(loopback.getHostName())) {
- addr = InetAddress.getByAddress(host, loopback.getAddress());
- } else {
- addr = getByNameWithSearch(host);
- if (addr == null) {
- addr = getByExactName(host);
- }
- }
- }
- // unresolvable!
- if (addr == null) {
- throw new UnknownHostException(host);
- }
- return addr;
- }
-
- InetAddress getByExactName(String host) {
- InetAddress addr = null;
- // InetAddress will use the search list unless the host is rooted
- // with a trailing dot. The trailing dot will disable any use of the
- // search path in a lower level resolver. See RFC 1535.
- String fqHost = host;
- if (!fqHost.endsWith(".")) fqHost += ".";
- try {
- addr = getInetAddressByName(fqHost);
- // can't leave the hostname as rooted or other parts of the system
- // malfunction, ex. kerberos principals are lacking proper host
- // equivalence for rooted/non-rooted hostnames
- addr = InetAddress.getByAddress(host, addr.getAddress());
- } catch (UnknownHostException e) {
- // ignore, caller will throw if necessary
- }
- return addr;
- }
-
- InetAddress getByNameWithSearch(String host) {
- InetAddress addr = null;
- if (host.endsWith(".")) { // already qualified?
- addr = getByExactName(host);
- } else {
- for (String domain : searchDomains) {
- String dot = !domain.startsWith(".") ? "." : "";
- addr = getByExactName(host + dot + domain);
- if (addr != null) break;
- }
- }
- return addr;
- }
-
- // implemented as a separate method to facilitate unit testing
- InetAddress getInetAddressByName(String host) throws UnknownHostException {
- return InetAddress.getByName(host);
- }
-
- void setSearchDomains(String ... domains) {
- searchDomains = Arrays.asList(domains);
- }
- }
-
- /**
- * This is for testing only!
- */
- static void setHostResolver(HostResolver newResolver) {
- hostResolver = newResolver;
- }
-
/**
* Resolve the uri's hostname and add the default port if not in the uri
* @param uri to resolve
@@ -404,7 +237,7 @@ public class NetUtils {
String fqHost = canonicalizedHostCache.get(host);
if (fqHost == null) {
try {
- fqHost = hostResolver.getByName(host).getHostName();
+ fqHost = SecurityUtil.getByName(host).getHostName();
// slight race condition, but won't hurt
canonicalizedHostCache.put(host, fqHost);
} catch (UnknownHostException e) {
Modified:
hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/security/SecurityUtil.java?rev=1235108&r1=1235107&r2=1235108&view=diff
==============================================================================
---
hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/security/SecurityUtil.java
(original)
+++
hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/security/SecurityUtil.java
Tue Jan 24 01:33:56 2012
@@ -23,6 +23,8 @@ import java.net.URI;
import java.net.URL;
import java.net.UnknownHostException;
import java.security.AccessController;
+import java.util.Arrays;
+import java.util.List;
import java.util.Set;
import javax.security.auth.Subject;
@@ -37,6 +39,9 @@ import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.authorize.AccessControlList;
import org.apache.hadoop.security.token.Token;
+//this will need to be replaced someday when there is a suitable replacement
+import sun.net.dns.ResolverConfiguration;
+import sun.net.util.IPAddressUtil;
import sun.security.jgss.krb5.Krb5Util;
import sun.security.krb5.Credentials;
import sun.security.krb5.PrincipalName;
@@ -46,8 +51,9 @@ public class SecurityUtil {
public static final String HOSTNAME_PATTERN = "_HOST";
// controls whether buildTokenService will use an ip or host/ip as given
- // by the user
- private static boolean useIpForTokenService;
+ // by the user; visible for testing
+ static boolean useIpForTokenService;
+ static HostResolver hostResolver;
static {
boolean useIp = new Configuration().getBoolean(
@@ -61,15 +67,9 @@ public class SecurityUtil {
*/
static void setTokenServiceUseIp(boolean flag) {
useIpForTokenService = flag;
- NetUtils.setUseQualifiedHostResolver(!flag);
- }
-
- /**
- * Intended only for temporary use by NetUtils. Do not use.
- * @return whether tokens use an IP address
- */
- public static boolean getTokenServiceUseIp() {
- return useIpForTokenService;
+ hostResolver = !useIpForTokenService
+ ? new QualifiedHostResolver()
+ : new StandardHostResolver();
}
/**
@@ -119,6 +119,7 @@ public class SecurityUtil {
* it will be removed when the Java behavior is changed.
*
* @param remoteHost Target URL the krb-https client will access
+ * @throws IOException if a service ticket is not available
*/
public static void fetchServiceTicket(URL remoteHost) throws IOException {
if(!UserGroupInformation.isSecurityEnabled())
@@ -155,7 +156,7 @@ public class SecurityUtil {
* @param hostname
* the fully-qualified domain name used for substitution
* @return converted Kerberos principal name
- * @throws IOException
+ * @throws IOException if the service ticket cannot be retrieved
*/
public static String getServerPrincipal(String principalConfig,
String hostname) throws IOException {
@@ -180,7 +181,7 @@ public class SecurityUtil {
* @param addr
* InetAddress of the host used for substitution
* @return converted Kerberos principal name
- * @throws IOException
+ * @throws IOException if the client address cannot be determined
*/
public static String getServerPrincipal(String principalConfig,
InetAddress addr) throws IOException {
@@ -227,7 +228,7 @@ public class SecurityUtil {
* the key to look for keytab file in conf
* @param userNameKey
* the key to look for user's Kerberos principal name in conf
- * @throws IOException
+ * @throws IOException if the client address cannot be determined
*/
public static void login(final Configuration conf,
final String keytabFileKey, final String userNameKey) throws IOException
{
@@ -246,7 +247,7 @@ public class SecurityUtil {
* the key to look for user's Kerberos principal name in conf
* @param hostname
* hostname to use for substitution
- * @throws IOException
+ * @throws IOException if login fails
*/
public static void login(final Configuration conf,
final String keytabFileKey, final String userNameKey, String hostname)
@@ -345,4 +346,155 @@ public class SecurityUtil {
public static String getHostFromPrincipal(String principalName) {
return new KerberosName(principalName).getHostName();
}
+
+ /**
+ * Resolves a host subject to the security requirements determined by
+ * hadoop.security.token.service.use_ip.
+ *
+ * @param hostname host or ip to resolve
+ * @return a resolved host
+ * @throws UnknownHostException if the host doesn't exist
+ */
+ //@InterfaceAudience.Private
+ public static
+ InetAddress getByName(String hostname) throws UnknownHostException {
+ return hostResolver.getByName(hostname);
+ }
+
+ interface HostResolver {
+ InetAddress getByName(String host) throws UnknownHostException;
+ }
+
+ /**
+ * Uses standard java host resolution
+ */
+ static class StandardHostResolver implements HostResolver {
+ public InetAddress getByName(String host) throws UnknownHostException {
+ return InetAddress.getByName(host);
+ }
+ }
+
+ /**
+ * This an alternate resolver with important properties that the standard
+ * java resolver lacks:
+ * 1) The hostname is fully qualified. This avoids security issues if not
+ * all hosts in the cluster do not share the same search domains. It
+ * also prevents other hosts from performing unnecessary dns searches.
+ * In contrast, InetAddress simply returns the host as given.
+ * 2) The InetAddress is instantiated with an exact host and IP to prevent
+ * further unnecessary lookups. InetAddress may perform an unnecessary
+ * reverse lookup for an IP.
+ * 3) A call to getHostName() will always return the qualified hostname, or
+ * more importantly, the IP if instantiated with an IP. This avoids
+ * unnecessary dns timeouts if the host is not resolvable.
+ * 4) Point 3 also ensures that if the host is re-resolved, ex. during a
+ * connection re-attempt, that a reverse lookup to host and forward
+ * lookup to IP is not performed since the reverse/forward mappings may
+ * not always return the same IP. If the client initiated a connection
+ * with an IP, then that IP is all that should ever be contacted.
+ *
+ * NOTE: this resolver is only used if:
+ * hadoop.security.token.service.use_ip=false
+ */
+ protected static class QualifiedHostResolver implements HostResolver {
+ @SuppressWarnings("unchecked")
+ private List<String> searchDomains =
+ ResolverConfiguration.open().searchlist();
+
+ /**
+ * Create an InetAddress with a fully qualified hostname of the given
+ * hostname. InetAddress does not qualify an incomplete hostname that
+ * is resolved via the domain search list.
+ * {@link InetAddress#getCanonicalHostName()} will fully qualify the
+ * hostname, but it always return the A record whereas the given hostname
+ * may be a CNAME.
+ *
+ * @param host a hostname or ip address
+ * @return InetAddress with the fully qualified hostname or ip
+ * @throws UnknownHostException if host does not exist
+ */
+ public InetAddress getByName(String host) throws UnknownHostException {
+ InetAddress addr = null;
+
+ if (IPAddressUtil.isIPv4LiteralAddress(host)) {
+ // use ipv4 address as-is
+ byte[] ip = IPAddressUtil.textToNumericFormatV4(host);
+ addr = InetAddress.getByAddress(host, ip);
+ } else if (IPAddressUtil.isIPv6LiteralAddress(host)) {
+ // use ipv6 address as-is
+ byte[] ip = IPAddressUtil.textToNumericFormatV6(host);
+ addr = InetAddress.getByAddress(host, ip);
+ } else if (host.endsWith(".")) {
+ // a rooted host ends with a dot, ex. "host."
+ // rooted hosts never use the search path, so only try an exact lookup
+ addr = getByExactName(host);
+ } else if (host.contains(".")) {
+ // the host contains a dot (domain), ex. "host.domain"
+ // try an exact host lookup, then fallback to search list
+ addr = getByExactName(host);
+ if (addr == null) {
+ addr = getByNameWithSearch(host);
+ }
+ } else {
+ // it's a simple host with no dots, ex. "host"
+ // try the search list, then fallback to exact host
+ InetAddress loopback = InetAddress.getByName(null);
+ if (host.equalsIgnoreCase(loopback.getHostName())) {
+ addr = InetAddress.getByAddress(host, loopback.getAddress());
+ } else {
+ addr = getByNameWithSearch(host);
+ if (addr == null) {
+ addr = getByExactName(host);
+ }
+ }
+ }
+ // unresolvable!
+ if (addr == null) {
+ throw new UnknownHostException(host);
+ }
+ return addr;
+ }
+
+ InetAddress getByExactName(String host) {
+ InetAddress addr = null;
+ // InetAddress will use the search list unless the host is rooted
+ // with a trailing dot. The trailing dot will disable any use of the
+ // search path in a lower level resolver. See RFC 1535.
+ String fqHost = host;
+ if (!fqHost.endsWith(".")) fqHost += ".";
+ try {
+ addr = getInetAddressByName(fqHost);
+ // can't leave the hostname as rooted or other parts of the system
+ // malfunction, ex. kerberos principals are lacking proper host
+ // equivalence for rooted/non-rooted hostnames
+ addr = InetAddress.getByAddress(host, addr.getAddress());
+ } catch (UnknownHostException e) {
+ // ignore, caller will throw if necessary
+ }
+ return addr;
+ }
+
+ InetAddress getByNameWithSearch(String host) {
+ InetAddress addr = null;
+ if (host.endsWith(".")) { // already qualified?
+ addr = getByExactName(host);
+ } else {
+ for (String domain : searchDomains) {
+ String dot = !domain.startsWith(".") ? "." : "";
+ addr = getByExactName(host + dot + domain);
+ if (addr != null) break;
+ }
+ }
+ return addr;
+ }
+
+ // implemented as a separate method to facilitate unit testing
+ InetAddress getInetAddressByName(String host) throws UnknownHostException {
+ return InetAddress.getByName(host);
+ }
+
+ void setSearchDomains(String ... domains) {
+ searchDomains = Arrays.asList(domains);
+ }
+ }
}
Propchange: hadoop/common/branches/branch-1.0/src/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 24 01:33:56 2012
@@ -3,6 +3,7 @@
/hadoop/common/branches/branch-0.20-security/src/mapred:1170042,1170087,1170997,1171137,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1177907,1179036,1179519,1179857,1183086,1190089,1190100
/hadoop/common/branches/branch-0.20-security-203/src/mapred:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1128115
/hadoop/common/branches/branch-0.20-security-204/src/mapred:1128390
+/hadoop/common/branches/branch-1/src/mapred:1235107
/hadoop/core/branches/branch-0.19/src/mapred:713112
/hadoop/core/trunk/src/mapred:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
/hadoop/mapreduce/trunk/src/java:808650
Modified:
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/fs/TestFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/fs/TestFileSystem.java?rev=1235108&r1=1235107&r2=1235108&view=diff
==============================================================================
---
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/fs/TestFileSystem.java
(original)
+++
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/fs/TestFileSystem.java
Tue Jan 24 01:33:56 2012
@@ -60,7 +60,7 @@ import org.apache.hadoop.mapred.Reporter
import org.apache.hadoop.mapred.SequenceFileInputFormat;
import org.apache.hadoop.mapred.lib.LongSumReducer;
import org.apache.hadoop.net.NetUtils;
-import org.apache.hadoop.net.NetUtilsTestResolver;
+import org.apache.hadoop.security.NetUtilsTestResolver;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.security.token.TokenIdentifier;
Modified:
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/net/TestNetUtils.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/net/TestNetUtils.java?rev=1235108&r1=1235107&r2=1235108&view=diff
==============================================================================
---
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/net/TestNetUtils.java
(original)
+++
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/net/TestNetUtils.java
Tue Jan 24 01:33:56 2012
@@ -33,6 +33,7 @@ import java.net.UnknownHostException;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.security.NetUtilsTestResolver;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
Modified:
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/security/TestSecurityUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/security/TestSecurityUtil.java?rev=1235108&r1=1235107&r2=1235108&view=diff
==============================================================================
---
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/security/TestSecurityUtil.java
(original)
+++
hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/security/TestSecurityUtil.java
Tue Jan 24 01:33:56 2012
@@ -200,7 +200,7 @@ public class TestSecurityUtil {
assertTrue(!addr.isUnresolved());
// don't know what the standard resolver will return for hostname.
// should be host for host; host or ip for ip is ambiguous
- if (!SecurityUtil.getTokenServiceUseIp()) {
+ if (!SecurityUtil.useIpForTokenService) {
assertEquals(host, addr.getHostName());
assertEquals(host, addr.getAddress().getHostName());
}
