This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 618b676bf ZOOKEEPER-3996: Fix flaky
ReadOnlyModeTest.testConnectionEvents (#1896)
618b676bf is described below
commit 618b676bf16c2a68fa3c215fdba3fe6049359493
Author: Kezhu Wang <[email protected]>
AuthorDate: Mon Jun 19 17:07:28 2023 +0800
ZOOKEEPER-3996: Fix flaky ReadOnlyModeTest.testConnectionEvents (#1896)
The same watcher was resued across different clients. It is hard to
know which event will last during verification, disconnected from old
client or connected from new client.
A brand new watcher solves this.
---
.../java/org/apache/zookeeper/test/ClientBase.java | 24 ++++++++++++++--------
.../apache/zookeeper/test/ReadOnlyModeTest.java | 1 +
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java
index e2257c156..cf35fdc54 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java
@@ -124,6 +124,12 @@ public abstract class ClientBase extends ZKTestCase {
public synchronized boolean isConnected() {
return connected;
}
+
+ protected synchronized String connectionDescription() {
+ return String.format("connected(%s), syncConnected(%s),
readOnlyConnected(%s)",
+ connected, syncConnected, readOnlyConnected);
+ }
+
public synchronized void waitForConnected(long timeout) throws
InterruptedException, TimeoutException {
long expire = Time.currentElapsedTime() + timeout;
long left = timeout;
@@ -132,8 +138,7 @@ public abstract class ClientBase extends ZKTestCase {
left = expire - Time.currentElapsedTime();
}
if (!connected) {
- throw new TimeoutException("Failed to connect to ZooKeeper
server.");
-
+ throw new TimeoutException("Failed to connect to ZooKeeper
server: " + connectionDescription());
}
}
public synchronized void waitForSyncConnected(long timeout) throws
InterruptedException, TimeoutException {
@@ -144,18 +149,22 @@ public abstract class ClientBase extends ZKTestCase {
left = expire - Time.currentElapsedTime();
}
if (!syncConnected) {
- throw new TimeoutException("Failed to connect to read-write
ZooKeeper server.");
+ throw new TimeoutException(
+ "Failed to connect to read-write ZooKeeper server: "
+ + connectionDescription());
}
}
public synchronized void waitForReadOnlyConnected(long timeout) throws
InterruptedException, TimeoutException {
- long expire = System.currentTimeMillis() + timeout;
+ long expire = Time.currentElapsedTime() + timeout;
long left = timeout;
while (!readOnlyConnected && left > 0) {
wait(left);
- left = expire - System.currentTimeMillis();
+ left = expire - Time.currentElapsedTime();
}
if (!readOnlyConnected) {
- throw new TimeoutException("Failed to connect in read-only
mode to ZooKeeper server.");
+ throw new TimeoutException(
+ "Failed to connect in read-only mode to ZooKeeper server: "
+ + connectionDescription());
}
}
public synchronized void waitForDisconnected(long timeout) throws
InterruptedException, TimeoutException {
@@ -166,8 +175,7 @@ public abstract class ClientBase extends ZKTestCase {
left = expire - Time.currentElapsedTime();
}
if (connected) {
- throw new TimeoutException("Did not disconnect");
-
+ throw new TimeoutException("Did not disconnect: " +
connectionDescription());
}
}
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
index 49f871c1c..521a1247d 100644
---
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
+++
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
@@ -191,6 +191,7 @@ public class ReadOnlyModeTest extends ZKTestCase {
// Re-connect the client (in case we were connected to the shut down
// server and the local session was not persisted).
+ watcher = new CountdownWatcher();
zk = new ZooKeeper(qu.getConnString(), CONNECTION_TIMEOUT, watcher,
true);
long start = Time.currentElapsedTime();
while (!(zk.getState() == States.CONNECTEDREADONLY)) {
