Skip to content

HADOOP-17843. Support IPV6 with IP for internal and external communication #3290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: HADOOP-17800
Choose a base branch
from
Open

HADOOP-17843. Support IPV6 with IP for internal and external communication #3290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import javax.net.SocketFactory;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hadoop.security.AccessControlException;
import org.apache.hadoop.thirdparty.com.google.common.cache.Cache;
import org.apache.hadoop.thirdparty.com.google.common.cache.CacheBuilder;
Expand Down Expand Up @@ -1218,4 +1219,30 @@ public static InetAddress bindToLocalAddress(InetAddress localAddr, boolean
}
return null;
}

/**
* Parse the given address into IP & Port number pair.
* @param bindAddress IP Address to parse
* @return Pair of IP-Address & Port number.
*/
public static Pair<String, Integer> parseAddress2IpAndPort(
String bindAddress) {
String[] parts = org.apache.hadoop.util.StringUtils
.split(bindAddress, ':');
Pair <String, Integer> pair = null;
//If bind address is IPv6
if (parts.length > 2) {
String target = bindAddress;
int i = target.lastIndexOf(":");
String ipAddress = '['+target.substring(0, i)+']';
pair = Pair.of(ipAddress, Integer.parseInt(parts[parts.length-1]));
} else if (parts.length == 2) {
//Given address is IPv4 Address
pair = Pair.of(parts[0], Integer.parseInt(parts[1]));
} else {
//No port specified, consider port number as 0
pair = Pair.of(bindAddress, 0);
}
return pair;
}
}
16 changes: 16 additions & 0 deletions hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import java.util.concurrent.TimeUnit;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.security.KerberosAuthException;
Expand Down Expand Up @@ -854,4 +855,19 @@ public void testCreateSocketAddressWithIPV6() throws Throwable {
assertEquals(ipv6Address, addr.getHostName());
assertEquals(12345, addr.getPort());
}

@Test
public void testParseAddress2IpAndPort() {
String ip = "10.10.10.10";
Pair<String, Integer> pair = NetUtils.parseAddress2IpAndPort(ip);
assertEquals(pair.getLeft(), ip);
assertEquals(pair.getRight().longValue(), 0);
pair = NetUtils.parseAddress2IpAndPort(ip+":8080");
assertEquals(pair.getLeft(), ip);
assertEquals(pair.getRight().longValue(), 8080);
ip = "10:10:10:10:10:10:10:10";
pair = NetUtils.parseAddress2IpAndPort(ip+":8080");
assertEquals(pair.getLeft(), '['+ip+']');
assertEquals(pair.getRight().longValue(), 8080);
}
}
4 changes: 4 additions & 0 deletions hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,10 @@ public static URI getInfoServer(InetSocketAddress namenodeAddr,
authority = substituteForWildcardAddress(authority,
namenodeAddr.getHostName());
}
if (!authority.startsWith("[")
&& StringUtils.countMatches(authority, ":") > 2) {
authority = NetUtils.normalizeV6Address(authority);
}
return URI.create(scheme + "://" + authority);
}

Expand Down
7 changes: 7 additions & 0 deletions hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,13 @@ public void testGetInfoServer() throws IOException, URISyntaxException {
assertEquals(
URI.create("http://localhost:" + DFS_NAMENODE_HTTP_PORT_DEFAULT),
httpAddress);

//Verify IPv6 Address
httpAddress = DFSUtil.getInfoServer(new InetSocketAddress(
"::0", 8020), conf, "http");
assertEquals(
URI.create("http://[0:0:0:0:0:0:0:0]:" + DFS_NAMENODE_HTTP_PORT_DEFAULT),
httpAddress);
}

@Test
Expand Down
11 changes: 4 additions & 7 deletions ...t/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@

import javax.servlet.http.HttpServlet;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configuration.IntegerRanges;
import org.apache.hadoop.http.HttpConfig.Policy;
import org.apache.hadoop.http.HttpServer2;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authorize.AccessControlList;
import org.apache.hadoop.security.http.RestCsrfPreventionFilter;
Expand Down Expand Up @@ -118,12 +119,8 @@ static class ServletStruct {
}

public Builder<T> at(String bindAddress) {
String[] parts = StringUtils.split(bindAddress, ':');
if (parts.length == 2) {
int port = Integer.parseInt(parts[1]);
return at(parts[0], port, port == 0);
}
return at(bindAddress, 0, true);
Pair<String, Integer> pair = NetUtils.parseAddress2IpAndPort(bindAddress);
return at(pair.getLeft(), pair.getRight(), pair.getRight() == 0);
}

public Builder<T> at(int port) {
Expand Down
12 changes: 5 additions & 7 deletions ...rn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@
import java.net.URI;

import com.google.common.net.HostAndPort;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.http.HttpServer2;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.authorize.AccessControlList;
import org.apache.hadoop.service.AbstractService;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
Expand Down Expand Up @@ -79,12 +80,9 @@ protected void serviceInit(Configuration conf) throws Exception {
" is not set so the proxy will not run.");
}

String[] parts = StringUtils.split(bindAddress, ':');
port = 0;
if (parts.length == 2) {
bindAddress = parts[0];
port = Integer.parseInt(parts[1]);
}
Pair<String, Integer> pair = NetUtils.parseAddress2IpAndPort(bindAddress);
bindAddress = pair.getLeft();
port = pair.getRight();

String bindHost = conf.getTrimmed(YarnConfiguration.PROXY_BIND_HOST, null);
if (bindHost != null) {
Expand Down