You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by da...@apache.org on 2020/09/18 10:49:29 UTC
[kafka] branch 2.6 updated: MINOR: Fix now that kafka.apache.org
resolves to 3 IP addresses (#9294)
This is an automated email from the ASF dual-hosted git repository.
davidarthur pushed a commit to branch 2.6
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/2.6 by this push:
new ea86498 MINOR: Fix now that kafka.apache.org resolves to 3 IP addresses (#9294)
ea86498 is described below
commit ea8649822e9b72799d7bed21b62b6da4f11a3831
Author: Justine Olshan <jo...@confluent.io>
AuthorDate: Thu Sep 17 13:44:43 2020 -0700
MINOR: Fix now that kafka.apache.org resolves to 3 IP addresses (#9294)
Reviewers: David Jacot <da...@gmail.com>, Boyang Chen <bo...@confluent.io>, David Arthur <mu...@gmail.com>
---
.../test/java/org/apache/kafka/clients/ClientUtilsTest.java | 10 +++++-----
.../org/apache/kafka/clients/ClusterConnectionStatesTest.java | 9 ++++-----
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/clients/src/test/java/org/apache/kafka/clients/ClientUtilsTest.java b/clients/src/test/java/org/apache/kafka/clients/ClientUtilsTest.java
index fc9a42f..3a281f8 100644
--- a/clients/src/test/java/org/apache/kafka/clients/ClientUtilsTest.java
+++ b/clients/src/test/java/org/apache/kafka/clients/ClientUtilsTest.java
@@ -102,20 +102,20 @@ public class ClientUtilsTest {
@Test
public void testResolveDnsLookup() throws UnknownHostException {
- // Note that kafka.apache.org resolves to 2 IP addresses
+ // Note that kafka.apache.org resolves to at least 2 IP addresses
assertEquals(1, ClientUtils.resolve("kafka.apache.org", ClientDnsLookup.DEFAULT).size());
}
@Test
public void testResolveDnsLookupAllIps() throws UnknownHostException {
- // Note that kafka.apache.org resolves to 2 IP addresses
- assertEquals(2, ClientUtils.resolve("kafka.apache.org", ClientDnsLookup.USE_ALL_DNS_IPS).size());
+ // Note that kafka.apache.org resolves to at least 2 IP addresses
+ assertTrue(ClientUtils.resolve("kafka.apache.org", ClientDnsLookup.USE_ALL_DNS_IPS).size() > 1);
}
@Test
public void testResolveDnsLookupResolveCanonicalBootstrapServers() throws UnknownHostException {
- // Note that kafka.apache.org resolves to 2 IP addresses
- assertEquals(2, ClientUtils.resolve("kafka.apache.org", ClientDnsLookup.RESOLVE_CANONICAL_BOOTSTRAP_SERVERS_ONLY).size());
+ // Note that kafka.apache.org resolves to at least 2 IP addresses
+ assertTrue(ClientUtils.resolve("kafka.apache.org", ClientDnsLookup.RESOLVE_CANONICAL_BOOTSTRAP_SERVERS_ONLY).size() > 1);
}
private List<InetSocketAddress> checkWithoutLookup(String... url) {
diff --git a/clients/src/test/java/org/apache/kafka/clients/ClusterConnectionStatesTest.java b/clients/src/test/java/org/apache/kafka/clients/ClusterConnectionStatesTest.java
index 2a427cc..fbb4497 100644
--- a/clients/src/test/java/org/apache/kafka/clients/ClusterConnectionStatesTest.java
+++ b/clients/src/test/java/org/apache/kafka/clients/ClusterConnectionStatesTest.java
@@ -256,7 +256,7 @@ public class ClusterConnectionStatesTest {
@Test
public void testMultipleIPsWithDefault() throws UnknownHostException {
- assertEquals(2, ClientUtils.resolve(hostTwoIps, ClientDnsLookup.USE_ALL_DNS_IPS).size());
+ assertTrue(ClientUtils.resolve(hostTwoIps, ClientDnsLookup.USE_ALL_DNS_IPS).size() > 1);
connectionStates.connecting(nodeId1, time.milliseconds(), hostTwoIps, ClientDnsLookup.DEFAULT);
InetAddress currAddress = connectionStates.currentAddress(nodeId1);
@@ -266,22 +266,21 @@ public class ClusterConnectionStatesTest {
@Test
public void testMultipleIPsWithUseAll() throws UnknownHostException {
- assertEquals(2, ClientUtils.resolve(hostTwoIps, ClientDnsLookup.USE_ALL_DNS_IPS).size());
+ assertTrue(ClientUtils.resolve(hostTwoIps, ClientDnsLookup.USE_ALL_DNS_IPS).size() > 1);
connectionStates.connecting(nodeId1, time.milliseconds(), hostTwoIps, ClientDnsLookup.USE_ALL_DNS_IPS);
InetAddress addr1 = connectionStates.currentAddress(nodeId1);
connectionStates.connecting(nodeId1, time.milliseconds(), hostTwoIps, ClientDnsLookup.USE_ALL_DNS_IPS);
InetAddress addr2 = connectionStates.currentAddress(nodeId1);
assertNotSame(addr1, addr2);
-
connectionStates.connecting(nodeId1, time.milliseconds(), hostTwoIps, ClientDnsLookup.USE_ALL_DNS_IPS);
InetAddress addr3 = connectionStates.currentAddress(nodeId1);
- assertSame(addr1, addr3);
+ assertNotSame(addr1, addr3);
}
@Test
public void testHostResolveChange() throws UnknownHostException, ReflectiveOperationException {
- assertEquals(2, ClientUtils.resolve(hostTwoIps, ClientDnsLookup.USE_ALL_DNS_IPS).size());
+ assertTrue(ClientUtils.resolve(hostTwoIps, ClientDnsLookup.USE_ALL_DNS_IPS).size() > 1);
connectionStates.connecting(nodeId1, time.milliseconds(), hostTwoIps, ClientDnsLookup.DEFAULT);
InetAddress addr1 = connectionStates.currentAddress(nodeId1);