You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ij...@apache.org on 2016/09/23 21:22:17 UTC
kafka git commit: KAFKA-3719; Allow underscores in hostname
Repository: kafka
Updated Branches:
refs/heads/trunk 6a13a3dba -> 0de807357
KAFKA-3719; Allow underscores in hostname
Technically this does not strictly adhere to RFC-952 however it is valid for domain names, urls and uris so we should loosen the requirements a tad.
Author: Ryan Pridgeon <ry...@gmail.com>
Reviewers: Ismael Juma <is...@juma.me.uk>
Closes #1856 from rnpridgeon/KAFKA-3719
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/0de80735
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/0de80735
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/0de80735
Branch: refs/heads/trunk
Commit: 0de807357be4d776747e960b5fd17ddeae9a6cad
Parents: 6a13a3d
Author: Ryan Pridgeon <ry...@gmail.com>
Authored: Fri Sep 23 22:20:41 2016 +0100
Committer: Ismael Juma <is...@juma.me.uk>
Committed: Fri Sep 23 22:20:56 2016 +0100
----------------------------------------------------------------------
.../org/apache/kafka/clients/ClientUtils.java | 18 ++++++++++--------
.../java/org/apache/kafka/common/utils/Utils.java | 2 +-
.../org/apache/kafka/common/utils/UtilsTest.java | 1 +
.../main/scala/kafka/cluster/BrokerEndPoint.scala | 2 +-
core/src/main/scala/kafka/cluster/EndPoint.scala | 2 +-
.../unit/kafka/cluster/BrokerEndPointTest.scala | 11 +++++++++++
6 files changed, 25 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/0de80735/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java
----------------------------------------------------------------------
diff --git a/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java b/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java
index 0c12ea1..2672b70 100644
--- a/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java
+++ b/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java
@@ -38,24 +38,26 @@ public class ClientUtils {
public static List<InetSocketAddress> parseAndValidateAddresses(List<String> urls) {
List<InetSocketAddress> addresses = new ArrayList<InetSocketAddress>();
for (String url : urls) {
- if (url != null && url.length() > 0) {
- String host = getHost(url);
- Integer port = getPort(url);
- if (host == null || port == null)
- throw new ConfigException("Invalid url in " + CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG + ": " + url);
+ if (url != null && !url.isEmpty()) {
try {
+ String host = getHost(url);
+ Integer port = getPort(url);
+ if (host == null || port == null)
+ throw new ConfigException("Invalid url in " + CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG + ": " + url);
+
InetSocketAddress address = new InetSocketAddress(host, port);
+
if (address.isUnresolved()) {
- log.warn("Removing server from " + CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG + " as DNS resolution failed: " + url);
+ log.warn("Removing server {} from {} as DNS resolution failed for {}", url, CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, host);
} else {
addresses.add(address);
}
- } catch (NumberFormatException e) {
+ } catch (IllegalArgumentException e) {
throw new ConfigException("Invalid port in " + CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG + ": " + url);
}
}
}
- if (addresses.size() < 1)
+ if (addresses.isEmpty())
throw new ConfigException("No resolvable bootstrap urls given in " + CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG);
return addresses;
}
http://git-wip-us.apache.org/repos/asf/kafka/blob/0de80735/clients/src/main/java/org/apache/kafka/common/utils/Utils.java
----------------------------------------------------------------------
diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Utils.java b/clients/src/main/java/org/apache/kafka/common/utils/Utils.java
index 8d7014a..1bbfea9 100755
--- a/clients/src/main/java/org/apache/kafka/common/utils/Utils.java
+++ b/clients/src/main/java/org/apache/kafka/common/utils/Utils.java
@@ -51,7 +51,7 @@ public class Utils {
// This matches URIs of formats: host:port and protocol:\\host:port
// IPv6 is supported with [ip] pattern
- private static final Pattern HOST_PORT_PATTERN = Pattern.compile(".*?\\[?([0-9a-zA-Z\\-%.:]*)\\]?:([0-9]+)");
+ private static final Pattern HOST_PORT_PATTERN = Pattern.compile(".*?\\[?([0-9a-zA-Z\\-%._:]*)\\]?:([0-9]+)");
public static final String NL = System.getProperty("line.separator");
http://git-wip-us.apache.org/repos/asf/kafka/blob/0de80735/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java
----------------------------------------------------------------------
diff --git a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java
index 1af7e43..46400b4 100755
--- a/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java
+++ b/clients/src/test/java/org/apache/kafka/common/utils/UtilsTest.java
@@ -38,6 +38,7 @@ public class UtilsTest {
assertEquals("127.0.0.1", getHost("127.0.0.1:8000"));
assertEquals("mydomain.com", getHost("PLAINTEXT://mydomain.com:8080"));
assertEquals("MyDomain.com", getHost("PLAINTEXT://MyDomain.com:8080"));
+ assertEquals("My_Domain.com", getHost("PLAINTEXT://My_Domain.com:8080"));
assertEquals("::1", getHost("[::1]:1234"));
assertEquals("2001:db8:85a3:8d3:1319:8a2e:370:7348", getHost("PLAINTEXT://[2001:db8:85a3:8d3:1319:8a2e:370:7348]:5678"));
assertEquals("2001:DB8:85A3:8D3:1319:8A2E:370:7348", getHost("PLAINTEXT://[2001:DB8:85A3:8D3:1319:8A2E:370:7348]:5678"));
http://git-wip-us.apache.org/repos/asf/kafka/blob/0de80735/core/src/main/scala/kafka/cluster/BrokerEndPoint.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/cluster/BrokerEndPoint.scala b/core/src/main/scala/kafka/cluster/BrokerEndPoint.scala
index 99cf666..91823f0 100644
--- a/core/src/main/scala/kafka/cluster/BrokerEndPoint.scala
+++ b/core/src/main/scala/kafka/cluster/BrokerEndPoint.scala
@@ -24,7 +24,7 @@ import org.apache.kafka.common.utils.Utils._
object BrokerEndPoint {
- private val uriParseExp = """\[?([0-9a-zA-Z\-%.:]*)\]?:([0-9]+)""".r
+ private val uriParseExp = """\[?([0-9a-zA-Z\-%._:]*)\]?:([0-9]+)""".r
/**
* BrokerEndPoint URI is host:port or [ipv6_host]:port
http://git-wip-us.apache.org/repos/asf/kafka/blob/0de80735/core/src/main/scala/kafka/cluster/EndPoint.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/cluster/EndPoint.scala b/core/src/main/scala/kafka/cluster/EndPoint.scala
index eb45aae..720d819 100644
--- a/core/src/main/scala/kafka/cluster/EndPoint.scala
+++ b/core/src/main/scala/kafka/cluster/EndPoint.scala
@@ -26,7 +26,7 @@ import org.apache.kafka.common.utils.Utils
object EndPoint {
- private val uriParseExp = """^(.*)://\[?([0-9a-zA-Z\-%.:]*)\]?:(-?[0-9]+)""".r
+ private val uriParseExp = """^(.*)://\[?([0-9a-zA-Z\-%._:]*)\]?:(-?[0-9]+)""".r
def readFrom(buffer: ByteBuffer): EndPoint = {
val port = buffer.getInt()
http://git-wip-us.apache.org/repos/asf/kafka/blob/0de80735/core/src/test/scala/unit/kafka/cluster/BrokerEndPointTest.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/unit/kafka/cluster/BrokerEndPointTest.scala b/core/src/test/scala/unit/kafka/cluster/BrokerEndPointTest.scala
index cec8fec..5554b39 100644
--- a/core/src/test/scala/unit/kafka/cluster/BrokerEndPointTest.scala
+++ b/core/src/test/scala/unit/kafka/cluster/BrokerEndPointTest.scala
@@ -97,6 +97,11 @@ class BrokerEndPointTest extends Logging {
var endpoint = BrokerEndPoint.createBrokerEndPoint(1, connectionString)
assert(endpoint.host == "localhost")
assert(endpoint.port == 9092)
+ //KAFKA-3719
+ connectionString = "local_host:9092"
+ endpoint = BrokerEndPoint.createBrokerEndPoint(1, connectionString)
+ assert(endpoint.host == "local_host")
+ assert(endpoint.port == 9092)
// also test for ipv6
connectionString = "[::1]:9092"
endpoint = BrokerEndPoint.createBrokerEndPoint(1, connectionString)
@@ -121,6 +126,12 @@ class BrokerEndPointTest extends Logging {
assert(endpoint.host == "localhost")
assert(endpoint.port == 9092)
assert(endpoint.connectionString == "PLAINTEXT://localhost:9092")
+ // KAFKA-3719
+ connectionString = "PLAINTEXT://local_host:9092"
+ endpoint = EndPoint.createEndPoint(connectionString)
+ assert(endpoint.host == "local_host")
+ assert(endpoint.port == 9092)
+ assert(endpoint.connectionString == "PLAINTEXT://local_host:9092")
// also test for default bind
connectionString = "PLAINTEXT://:9092"
endpoint = EndPoint.createEndPoint(connectionString)