Skip to content

[FLINK-12840] fix network utils to work with ipv6 correctly #8734

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

Closed
ppotseluev wants to merge 1 commit into from
Closed

[FLINK-12840] fix network utils to work with ipv6 correctly #8734

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
6 changes: 6 additions & 0 deletions flink-core/src/main/java/org/apache/flink/util/NetUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@ public static String unresolvedHostToNormalizedString(String host) {
host = InetAddress.getLoopbackAddress().getHostAddress();
} else {
host = host.trim().toLowerCase();
if (host.startsWith("[") && host.endsWith("]")) {
String address = host.substring(1, host.length() - 1);
if (IPAddressUtil.isIPv6LiteralAddress(address)) {
host = address;
}
}
}

// normalize and valid address
Expand Down
6 changes: 6 additions & 0 deletions flink-core/src/test/java/org/apache/flink/util/NetUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,12 @@ public void testFormatAddress() throws UnknownHostException {
int port = 42;
Assert.assertEquals("[2001:db8:85a3::8a2e:370:7334]:" + port, NetUtils.unresolvedHostAndPortToNormalizedString(host, port));
}
{
// [IPv6]
String host = "[2001:0db8:85a3:0000:0000:8a2e:0370:7334]";
int port = 42;
Assert.assertEquals("[2001:db8:85a3::8a2e:370:7334]:" + port, NetUtils.unresolvedHostAndPortToNormalizedString(host, port));
}
{
// Hostnames
String host = "somerandomhostname";
Expand Down
4 changes: 2 additions & 2 deletions flink-runtime/src/main/scala/org/apache/flink/runtime/akka/AkkaUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,8 +556,8 @@ object AkkaUtils {
| remote {
| netty {
| tcp {
| hostname = $effectiveHostname
| bind-hostname = $bindAddress
| hostname = "$effectiveHostname"
| bind-hostname = "$bindAddress"
| }
| }
| }
Expand Down
11 changes: 11 additions & 0 deletions flink-runtime/src/test/scala/org/apache/flink/runtime/akka/AkkaUtilsTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,15 @@ class AkkaUtilsTest
akkaConfig.getInt("akka.actor.default-dispatcher.thread-pool-executor.core-pool-size-max")
.should(equal(maxThreads))
}

test("getAkkaConfig should work with ipv6 addresses") {
val ipv6AddressString = "2001:db8:10:11:12:ff00:42:8329"
val configuration = new Configuration()
val port = 1234

val akkaConfig = AkkaUtils.getAkkaConfig(configuration, ipv6AddressString, port)

akkaConfig.getString("akka.remote.netty.tcp.hostname") should
equal(NetUtils.unresolvedHostToNormalizedString(ipv6AddressString))
}
}