Make it possible to turn zk acces control on from the env

1 files changed, 7 insertions, 3 deletions

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 b52f755bdc4..a51d15fec79 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/RestrictedServerCnxnFactory.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/RestrictedServerCnxnFactory.java
@@ -39,9 +39,13 @@ public class RestrictedServerCnxnFactory extends NIOServerCnxnFactory {
         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.info(errorMessage);
-            // throw new IllegalArgumentException(errorMessage);
-            log.fine("Would reject if activated: " + errorMessage);
+            if ("true".equals(System.getenv("vespa_zkfacade__restrict"))) {
+                log.info(errorMessage);
+                throw new IllegalArgumentException(errorMessage);
+            }
+            else {
+                log.fine("Would reject if activated: " + errorMessage);
+            }
         }
         log.fine("Allowing connection to ZooKeeper from " + remoteHost + ", as it is in " + zookeeperClients);
         return super.createConnection(socket, selection);