You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2017/07/18 13:20:46 UTC
[3/4] curator git commit: Updated wildcard address check for IPv4 +
IPv6
Updated wildcard address check for IPv4 + IPv6
Also added several new tests to ensure that both IPv4 and IPv6 addresses work correctly.
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/bd8fb660
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/bd8fb660
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/bd8fb660
Branch: refs/heads/master
Commit: bd8fb6609601f399e7d3ffa0a6b60c658686a4d7
Parents: ddf4cb2
Author: Kenco <da...@gmail.com>
Authored: Mon Jul 17 21:19:47 2017 +0100
Committer: Kenco <da...@gmail.com>
Committed: Mon Jul 17 21:19:47 2017 +0100
----------------------------------------------------------------------
.../curator/framework/imps/EnsembleTracker.java | 5 +--
.../framework/imps/TestReconfiguration.java | 46 ++++++++++++++++++--
2 files changed, 44 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/bd8fb660/curator-framework/src/main/java/org/apache/curator/framework/imps/EnsembleTracker.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/EnsembleTracker.java b/curator-framework/src/main/java/org/apache/curator/framework/imps/EnsembleTracker.java
index 97d8d8c..7d8fe19 100644
--- a/curator-framework/src/main/java/org/apache/curator/framework/imps/EnsembleTracker.java
+++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/EnsembleTracker.java
@@ -42,8 +42,6 @@ import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.Closeable;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
@@ -175,9 +173,8 @@ public class EnsembleTracker implements Closeable, CuratorWatcher
{
sb.append(",");
}
- InetAddress wildcardAddress = new InetSocketAddress(0).getAddress();
String hostAddress;
- if ( wildcardAddress.equals(server.clientAddr.getAddress()) )
+ if ( server.clientAddr.getAddress().isAnyLocalAddress() )
{
hostAddress = server.addr.getAddress().getHostAddress();
}
http://git-wip-us.apache.org/repos/asf/curator/blob/bd8fb660/curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java
----------------------------------------------------------------------
diff --git a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java
index 9e79f24..ef2faed 100644
--- a/curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java
+++ b/curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java
@@ -334,7 +334,7 @@ public class TestReconfiguration extends BaseClassForTests
}
@Test
- public void testConfigToConnectionStringNormal() throws Exception
+ public void testConfigToConnectionStringIPv4Normal() throws Exception
{
String config = "server.1=10.1.2.3:2888:3888:participant;10.2.3.4:2181";
String configString = EnsembleTracker.configToConnectionString(toQuorumVerifier(config.getBytes()));
@@ -342,7 +342,15 @@ public class TestReconfiguration extends BaseClassForTests
}
@Test
- public void testConfigToConnectionStringNoClientAddr() throws Exception
+ public void testConfigToConnectionStringIPv6Normal() throws Exception
+ {
+ String config = "server.1=[1010:0001:0002:0003:0004:0005:0006:0007]:2888:3888:participant;[2001:db8:85a3:0:0:8a2e:370:7334]:2181";
+ String configString = EnsembleTracker.configToConnectionString(toQuorumVerifier(config.getBytes()));
+ Assert.assertEquals("2001:db8:85a3:0:0:8a2e:370:7334:2181", configString);
+ }
+
+ @Test
+ public void testConfigToConnectionStringIPv4NoClientAddr() throws Exception
{
String config = "server.1=10.1.2.3:2888:3888:participant;2181";
String configString = EnsembleTracker.configToConnectionString(toQuorumVerifier(config.getBytes()));
@@ -350,7 +358,7 @@ public class TestReconfiguration extends BaseClassForTests
}
@Test
- public void testConfigToConnectionStringWildcardClientAddr() throws Exception
+ public void testConfigToConnectionStringIPv4WildcardClientAddr() throws Exception
{
String config = "server.1=10.1.2.3:2888:3888:participant;0.0.0.0:2181";
String configString = EnsembleTracker.configToConnectionString(toQuorumVerifier(config.getBytes()));
@@ -365,6 +373,38 @@ public class TestReconfiguration extends BaseClassForTests
Assert.assertEquals("", configString);
}
+ @Test
+ public void testIPv6Wildcard1() throws Exception
+ {
+ String config = "server.1=[2001:db8:85a3:0:0:8a2e:370:7334]:2888:3888:participant;[::]:2181";
+ String configString = EnsembleTracker.configToConnectionString(toQuorumVerifier(config.getBytes()));
+ Assert.assertEquals("2001:db8:85a3:0:0:8a2e:370:7334:2181", configString);
+ }
+
+ @Test
+ public void testIPv6Wildcard2() throws Exception
+ {
+ String config = "server.1=[1010:0001:0002:0003:0004:0005:0006:0007]:2888:3888:participant;[::0]:2181";
+ String configString = EnsembleTracker.configToConnectionString(toQuorumVerifier(config.getBytes()));
+ Assert.assertEquals("1010:1:2:3:4:5:6:7:2181", configString);
+ }
+
+ @Test
+ public void testMixedIPv1() throws Exception
+ {
+ String config = "server.1=10.1.2.3:2888:3888:participant;[::]:2181";
+ String configString = EnsembleTracker.configToConnectionString(toQuorumVerifier(config.getBytes()));
+ Assert.assertEquals("10.1.2.3:2181", configString);
+ }
+
+ @Test
+ public void testMixedIPv2() throws Exception
+ {
+ String config = "server.1=[2001:db8:85a3:0:0:8a2e:370:7334]:2888:3888:participant;127.0.0.1:2181";
+ String configString = EnsembleTracker.configToConnectionString(toQuorumVerifier(config.getBytes()));
+ Assert.assertEquals("127.0.0.1:2181", configString);
+ }
+
private CuratorFramework newClient()
{
return newClient(cluster.getConnectString());