This is an automated email from the ASF dual-hosted git repository.
arshad pushed a commit to branch branch-3.7.0
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.7.0 by this push:
new 842973e ZOOKEEPER-1871: Add an option to zkCli to wait for connection
before executing commands
842973e is described below
commit 842973ee36d975021912a64491ea0b82f2690276
Author: Mukti Krishnan <[email protected]>
AuthorDate: Fri Mar 12 00:05:07 2021 +0530
ZOOKEEPER-1871: Add an option to zkCli to wait for connection before
executing commands
-waitforconnection option will make zk client wait for -timeout time to
connect to zk server. timeout time is 30ms by default but can be specified
explicitly for a session using -timeout option in command line.
Author: Mukti <[email protected]>
Reviewers: maoling <[email protected]>, Mohammad Arshad <[email protected]>
Closes #1626 from MuktiKrishnan/ZOOKEEPER-1871-master and squashes the
following commits:
2947514b2 [Mukti] ZOOKEEPER-1871: Removed statement which was re-creating
zookeeper admin in ZooKeeperMain.java and added documentation for
waitforconnection in zookeeperCLI.md and
c475d46ff [Mukti] ZOOKEEPER-1871: Add an option to zkCli to wailt for
connection before executing commands
(cherry picked from commit 2e400114fdee9a870170749f6573d4499e1a850f)
Signed-off-by: Mohammad Arshad <[email protected]>
---
.../src/main/resources/markdown/zookeeperCLI.md | 2 ++
.../java/org/apache/zookeeper/ZooKeeperMain.java | 26 +++++++++++++++++++++-
.../java/org/apache/zookeeper/ZooKeeperTest.java | 21 +++++++++++++++++
3 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/zookeeper-docs/src/main/resources/markdown/zookeeperCLI.md
b/zookeeper-docs/src/main/resources/markdown/zookeeperCLI.md
index 668e64e..7096aa0 100644
--- a/zookeeper-docs/src/main/resources/markdown/zookeeperCLI.md
+++ b/zookeeper-docs/src/main/resources/markdown/zookeeperCLI.md
@@ -24,6 +24,8 @@ Enter into the ZooKeeper-cli
bin/zkCli.sh
# connect to the remote host with timeout:3s
bin/zkCli.sh -timeout 3000 -server remoteIP:2181
+# connect to the remote host with -waitforconnection option to wait for
connection success before executing commands
+bin/zkCli.sh -waitforconnection -timeout 3000 -server remoteIP:2181
# connect with a custom client configuration properties file
bin/zkCli.sh -client-configuration /path/to/client.properties
```
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeperMain.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeperMain.java
index ff8ce62..4ee378f 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeperMain.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeperMain.java
@@ -32,6 +32,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Stream;
@@ -68,6 +70,7 @@ public class ZooKeeperMain {
protected ZooKeeper zk;
protected String host = "";
+ private CountDownLatch connectLatch = null;
public boolean getPrintWatches() {
return printWatches;
@@ -106,6 +109,13 @@ public class ZooKeeperMain {
ZooKeeperMain.printMessage("WATCHER::");
ZooKeeperMain.printMessage(event.toString());
}
+ if (connectLatch != null) {
+ // connection success
+ if (event.getType() == Event.EventType.None
+ && event.getState() == Event.KeeperState.SyncConnected) {
+ connectLatch.countDown();
+ }
+ }
}
}
@@ -168,6 +178,8 @@ public class ZooKeeperMain {
options.put("readonly", "true");
} else if (opt.equals("-client-configuration")) {
options.put("client-configuration", it.next());
+ } else if (opt.equals("-waitforconnection")) {
+ options.put("waitforconnection", "true");
}
} catch (NoSuchElementException e) {
System.err.println("Error: no argument found for option "
+ opt);
@@ -261,7 +273,19 @@ public class ZooKeeperMain {
}
}
- zk = new ZooKeeperAdmin(host,
Integer.parseInt(cl.getOption("timeout")), new MyWatcher(), readOnly,
clientConfig);
+ if (cl.getOption("waitforconnection") != null) {
+ connectLatch = new CountDownLatch(1);
+ }
+
+ int timeout = Integer.parseInt(cl.getOption("timeout"));
+ zk = new ZooKeeperAdmin(host, timeout, new MyWatcher(), readOnly,
clientConfig);
+ if (connectLatch != null) {
+ if (!connectLatch.await(timeout, TimeUnit.MILLISECONDS)) {
+ zk.close();
+ throw new
IOException(KeeperException.create(KeeperException.Code.CONNECTIONLOSS));
+ }
+ }
+
}
public static void main(String[] args) throws IOException,
InterruptedException {
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/ZooKeeperTest.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/ZooKeeperTest.java
index b726c47..f69e0c6 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/ZooKeeperTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/ZooKeeperTest.java
@@ -774,4 +774,25 @@ public class ZooKeeperTest extends ClientBase {
});
}
+ @Test
+ public void testWaitForConnection() throws Exception {
+ // get a wrong port number
+ int invalidPort = PortAssignment.unique();
+ long timeout = 3000L; // millisecond
+ String[] args1 = {"-server", "localhost:" + invalidPort, "-timeout",
+ Long.toString(timeout), "-waitforconnection", "ls", "/"};
+ long startTime = System.currentTimeMillis();
+ // try to connect to a non-existing server so as to wait until
wait_timeout
+ try {
+ ZooKeeperMain zkMain = new ZooKeeperMain(args1);
+ fail("IOException was expected");
+ } catch (IOException e) {
+ // do nothing
+ }
+ long endTime = System.currentTimeMillis();
+ assertTrue(endTime - startTime >= timeout,
+ "ZooKeeeperMain does not wait until the specified timeout");
+
+ }
+
}
