HADOOP-7668. Add a NetUtils method that can tell if an InetAddress belongs to local host. Contributed by Suresh Srinivas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1176986 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
59586d8015
commit
9799353ee8
|
@ -20,6 +20,9 @@ Trunk (unreleased changes)
|
||||||
HADOOP-7635. RetryInvocationHandler should release underlying resources on
|
HADOOP-7635. RetryInvocationHandler should release underlying resources on
|
||||||
close (atm)
|
close (atm)
|
||||||
|
|
||||||
|
HADOOP-7668. Add a NetUtils method that can tell if an InetAddress
|
||||||
|
belongs to local host. (suresh)
|
||||||
|
|
||||||
BUGS
|
BUGS
|
||||||
|
|
||||||
HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required
|
HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required
|
||||||
|
|
|
@ -516,4 +516,27 @@ public class NetUtils {
|
||||||
} catch (UnknownHostException ignore) { }
|
} catch (UnknownHostException ignore) { }
|
||||||
return addr;
|
return addr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Given an InetAddress, checks to see if the address is a local address, by
|
||||||
|
* comparing the address with all the interfaces on the node.
|
||||||
|
* @param addr address to check if it is local node's address
|
||||||
|
* @return true if the address corresponds to the local node
|
||||||
|
*/
|
||||||
|
public static boolean isLocalAddress(InetAddress addr) {
|
||||||
|
// Check if the address is any local or loop back
|
||||||
|
boolean local = addr.isAnyLocalAddress() || addr.isLoopbackAddress();
|
||||||
|
System.out.println("address is any or loopback address " + addr);
|
||||||
|
|
||||||
|
// Check if the address is defined on any interface
|
||||||
|
if (!local) {
|
||||||
|
try {
|
||||||
|
local = NetworkInterface.getByInetAddress(addr) != null;
|
||||||
|
} catch (SocketException e) {
|
||||||
|
local = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
System.out.println("address " + addr + " is local " + local);
|
||||||
|
return local;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,13 +18,17 @@
|
||||||
package org.apache.hadoop.net;
|
package org.apache.hadoop.net;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
import java.net.InetAddress;
|
||||||
|
import java.net.NetworkInterface;
|
||||||
import java.net.Socket;
|
import java.net.Socket;
|
||||||
import java.net.ConnectException;
|
import java.net.ConnectException;
|
||||||
import java.net.SocketException;
|
import java.net.SocketException;
|
||||||
import java.net.InetSocketAddress;
|
import java.net.InetSocketAddress;
|
||||||
import java.net.UnknownHostException;
|
import java.net.UnknownHostException;
|
||||||
|
import java.util.Enumeration;
|
||||||
|
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
|
|
||||||
|
@ -88,4 +92,32 @@ public class TestNetUtils {
|
||||||
fail("NetUtils.verifyHostnames threw unexpected UnknownHostException");
|
fail("NetUtils.verifyHostnames threw unexpected UnknownHostException");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test for {@link NetUtils#isLocalAddress(java.net.InetAddress)}
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testIsLocalAddress() throws Exception {
|
||||||
|
// Test - local host is local address
|
||||||
|
assertTrue(NetUtils.isLocalAddress(InetAddress.getLocalHost()));
|
||||||
|
|
||||||
|
// Test - all addresses bound network interface is local address
|
||||||
|
Enumeration<NetworkInterface> interfaces = NetworkInterface
|
||||||
|
.getNetworkInterfaces();
|
||||||
|
if (interfaces != null) { // Iterate through all network interfaces
|
||||||
|
while (interfaces.hasMoreElements()) {
|
||||||
|
NetworkInterface i = interfaces.nextElement();
|
||||||
|
Enumeration<InetAddress> addrs = i.getInetAddresses();
|
||||||
|
if (addrs == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// Iterate through all the addresses of a network interface
|
||||||
|
while (addrs.hasMoreElements()) {
|
||||||
|
InetAddress addr = addrs.nextElement();
|
||||||
|
assertTrue(NetUtils.isLocalAddress(addr));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assertFalse(NetUtils.isLocalAddress(InetAddress.getByName("8.8.8.8")));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue