Allow config servers to connect to zk

2 files changed, 10 insertions, 7 deletions

diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
index 4c08924f8de..66734036ce5 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
@@ -54,7 +54,7 @@ public class Curator {
     private final String connectionSpec;
     private final int serverCount;
 
-    /** Creates a curator instance from a comma-separated string of ZooKeeper host names */
+    /** Creates a curator instance from a comma-separated string of ZooKeeper host:port strings */
     public static Curator create(String connectionSpec) {
         return new Curator(connectionSpec);
     }
@@ -64,7 +64,7 @@ public class Curator {
     public Curator(ConfigserverConfig configserverConfig, ZooKeeperServer server) {
         this(createConnectionSpec(configserverConfig));
     }
-
+    
     private static String createConnectionSpec(ConfigserverConfig config) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < config.zookeeperserver().size(); i++) {
@@ -103,15 +103,14 @@ public class Curator {
     }
 
     private static void validateConnectionSpec(String connectionSpec) {
-        if (connectionSpec == null || connectionSpec.isEmpty()) {
+        if (connectionSpec == null || connectionSpec.isEmpty())
             throw new IllegalArgumentException(String.format("Connections spec '%s' is not valid", connectionSpec));
-        }
     }
 
     /** Returns the number of zooKeeper servers in this cluster */
     public int serverCount() { return serverCount; }
 
-    /** Returns a comma-separated list of the zookeeper servers in this cluster */
+    /** Returns the servers in this cluster as a comma-separated list of host:port strings */
     public String connectionSpec() { return connectionSpec; }
 
     /** For internal use; prefer creating a {@link CuratorCounter} */
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/RestrictedServerCnxnFactory.java b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/RestrictedServerCnxnFactory.java
index 90c68461699..d8561c67767 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/RestrictedServerCnxnFactory.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/RestrictedServerCnxnFactory.java
@@ -27,18 +27,22 @@ public class RestrictedServerCnxnFactory extends NIOServerCnxnFactory {
     
     @Override
     protected NIOServerCnxn createConnection(SocketChannel socket, SelectionKey selection) throws IOException {
+        String remoteHost = ((InetSocketAddress)socket.getRemoteAddress()).getHostName(); // TODO: Move this line down
+
         String zookeeperClients = System.getProperty(ZooKeeperServer.ZOOKEEPER_VESPA_CLIENTS_PROPERTY);
-        if (zookeeperClients == null || zookeeperClients.isEmpty())
+        if (zookeeperClients == null || zookeeperClients.isEmpty()) {
+            log.info("Allowing connection to ZooKeeper from " + remoteHost + ", as " + ZooKeeperServer.ZOOKEEPER_VESPA_CLIENTS_PROPERTY + " is not set"); // TODO: Remove this line
             return super.createConnection(socket, selection); // client checking is not activated
+        }
 
         Set<String> zooKeeperClients = toHostnameSet(zookeeperClients);
-        String remoteHost = ((InetSocketAddress)socket.getRemoteAddress()).getHostName();
         if ( ! remoteHost.equals("localhost") && ! zooKeeperClients.contains(remoteHost)) {
             String errorMessage = "Rejecting connection to ZooKeeper from " + remoteHost +
                                   ": This cluster only allow connection from hosts in: " + zooKeeperClients;
             log.warning(errorMessage);
             throw new IllegalArgumentException(errorMessage);
         }
+        log.info("Allowing connection to ZooKeeper from " + remoteHost + ", as it is in " + zookeeperClients); // TODO: Remove this line
         return super.createConnection(socket, selection);
     }